arangodb 3.10.0 #13312
Merged
arangodb 3.10.0 #13312
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Unfortunately, maintaining two separate Dockerfiles for such a trivial difference between architectures is not going to be something we can accept (see also https://github.com/docker-library/official-images#multiple-architectures): --- aarch64/Dockerfile 2022-10-11 09:35:56.222930997 -0700
+++ x86_64/Dockerfile 2022-10-11 09:35:56.222930997 -0700
@@ -2,8 +2,8 @@
MAINTAINER Frank Celler <info@arangodb.com>
ENV ARANGO_VERSION 3.10.0
-ENV ARANGO_URL https://download.arangodb.com/arangodb310/DEBIAN/arm64
-ENV ARANGO_PACKAGE arangodb3_${ARANGO_VERSION}-1_arm64.deb
+ENV ARANGO_URL https://download.arangodb.com/arangodb310/DEBIAN/amd64
+ENV ARANGO_PACKAGE arangodb3_${ARANGO_VERSION}-1_amd64.deb
ENV ARANGO_PACKAGE_URL ${ARANGO_URL}/${ARANGO_PACKAGE}
ENV ARANGO_SIGNATURE_URL ${ARANGO_PACKAGE_URL}.asc
However, this should be reasonably straightforward to resolve -- something like this would be acceptable: diff --git a/alpine/3.10.0/x86_64/Dockerfile b/alpine/3.10.0/x86_64/Dockerfile
index 2a51d61..92eafcf 100644
--- a/alpine/3.10.0/x86_64/Dockerfile
+++ b/alpine/3.10.0/x86_64/Dockerfile
@@ -2,10 +2,6 @@ FROM alpine:3.16
MAINTAINER Frank Celler <info@arangodb.com>
ENV ARANGO_VERSION 3.10.0
-ENV ARANGO_URL https://download.arangodb.com/arangodb310/DEBIAN/amd64
-ENV ARANGO_PACKAGE arangodb3_${ARANGO_VERSION}-1_amd64.deb
-ENV ARANGO_PACKAGE_URL ${ARANGO_URL}/${ARANGO_PACKAGE}
-ENV ARANGO_SIGNATURE_URL ${ARANGO_PACKAGE_URL}.asc
# see
# https://www.arangodb.com/docs/3.10/programs-arangod-server.html#managing-endpoints
@@ -17,6 +13,16 @@ RUN apk add --no-cache gnupg pwgen binutils numactl numactl-tools nodejs yarn &&
gpg --batch --keyserver keys.openpgp.org --recv-keys CD8CB0F1E0AD5B52E93F41E7EA93F5E56E751E9B && \
mkdir /docker-entrypoint-initdb.d && \
cd /tmp && \
+ arch="$(apk --print-arch)" && \
+ case "$arch" in \
+ x86_64) dpkgArch='amd64' ;; \
+ aarch64) dpkgArch='arm64' ;; \
+ *) echo >&2 "unsupported: $arch" && exit 1 ;; \
+ esac && \
+ ARANGO_URL="https://download.arangodb.com/arangodb310/DEBIAN/$dpkgArch" && \
+ ARANGO_PACKAGE="arangodb3_${ARANGO_VERSION}-1_${dpkgArch}.deb" && \
+ ARANGO_PACKAGE_URL="${ARANGO_URL}/${ARANGO_PACKAGE}" && \
+ ARANGO_SIGNATURE_URL="${ARANGO_PACKAGE_URL}.asc" && \
wget ${ARANGO_SIGNATURE_URL} && \
wget ${ARANGO_PACKAGE_URL} && \
gpg --verify ${ARANGO_PACKAGE}.asc && \Another option would be to install diff --git a/alpine/3.10.0/x86_64/Dockerfile b/alpine/3.10.0/x86_64/Dockerfile
index 2a51d61..0c21bc2 100644
--- a/alpine/3.10.0/x86_64/Dockerfile
+++ b/alpine/3.10.0/x86_64/Dockerfile
@@ -2,21 +2,22 @@ FROM alpine:3.16
MAINTAINER Frank Celler <info@arangodb.com>
ENV ARANGO_VERSION 3.10.0
-ENV ARANGO_URL https://download.arangodb.com/arangodb310/DEBIAN/amd64
-ENV ARANGO_PACKAGE arangodb3_${ARANGO_VERSION}-1_amd64.deb
-ENV ARANGO_PACKAGE_URL ${ARANGO_URL}/${ARANGO_PACKAGE}
-ENV ARANGO_SIGNATURE_URL ${ARANGO_PACKAGE_URL}.asc
# see
# https://www.arangodb.com/docs/3.10/programs-arangod-server.html#managing-endpoints
# https://www.arangodb.com/docs/3.10/programs-arangod-log.html
-RUN apk add --no-cache gnupg pwgen binutils numactl numactl-tools nodejs yarn && \
+RUN apk add --no-cache dpkg gnupg pwgen binutils numactl numactl-tools nodejs yarn && \
yarn global add foxx-cli@2.0.1 && \
apk del yarn && \
gpg --batch --keyserver keys.openpgp.org --recv-keys CD8CB0F1E0AD5B52E93F41E7EA93F5E56E751E9B && \
mkdir /docker-entrypoint-initdb.d && \
cd /tmp && \
+ arch="$(dpkg --print-architecture)" && \
+ ARANGO_URL="https://download.arangodb.com/arangodb310/DEBIAN/$arch" && \
+ ARANGO_PACKAGE="arangodb3_${ARANGO_VERSION}-1_${arch}.deb" && \
+ ARANGO_PACKAGE_URL="${ARANGO_URL}/${ARANGO_PACKAGE}" && \
+ ARANGO_SIGNATURE_URL="${ARANGO_PACKAGE_URL}.asc" && \
wget ${ARANGO_SIGNATURE_URL} && \
wget ${ARANGO_PACKAGE_URL} && \
gpg --verify ${ARANGO_PACKAGE}.asc && \
@@ -31,7 +32,7 @@ RUN apk add --no-cache gnupg pwgen binutils numactl numactl-tools nodejs yarn &&
chmod -R 775 /var/lib/arangodb3 /var/lib/arangodb3-apps && \
rm -f /usr/bin/foxx && \
rm -f ${ARANGO_PACKAGE}* data.tar.gz && \
- apk del gnupg
+ apk del dpkg gnupg
# Note that Openshift runs containers by default with a random UID and GID 0.
# We need that the database and apps directory are writable for this config.
(With this option, you could also use tools like Additionally, for this to work you'll need to add |
|
@tianon ready for your review. Hopefully it's now acceptable. Thank you for the reply. |
Diff for c00353a:diff --git a/_bashbrew-cat b/_bashbrew-cat
index eac783b..9d5c562 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,6 +6,11 @@ Tags: 3.8, 3.8.7
GitCommit: 0e1a717e606a4fd6fa406fdb26bf5cc61486d0e5
Directory: alpine/3.8.7
-Tags: 3.9, 3.9.3, latest
+Tags: 3.9, 3.9.3
GitCommit: 66deb6fc6518f7d81a2e6087b2397447e240f8c4
Directory: alpine/3.9.3
+
+Tags: 3.10, 3.10.0, latest
+Architectures: amd64, arm64v8
+GitCommit: 31df6aaffd35f1e221d59cc1802eeb71db058c9d
+Directory: alpine/3.10.0
diff --git a/_bashbrew-list b/_bashbrew-list
index 265dab2..bd79657 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -2,4 +2,6 @@ arangodb:3.8
arangodb:3.8.7
arangodb:3.9
arangodb:3.9.3
+arangodb:3.10
+arangodb:3.10.0
arangodb:latest
diff --git a/arangodb_latest/Dockerfile b/arangodb_3.9.3/Dockerfile
similarity index 100%
copy from arangodb_latest/Dockerfile
copy to arangodb_3.9.3/Dockerfile
diff --git a/arangodb_3.8.7/docker-entrypoint.sh b/arangodb_3.9.3/docker-entrypoint.sh
similarity index 100%
copy from arangodb_3.8.7/docker-entrypoint.sh
copy to arangodb_3.9.3/docker-entrypoint.sh
diff --git a/arangodb_3.8.7/docker-foxx.sh b/arangodb_3.9.3/docker-foxx.sh
similarity index 100%
copy from arangodb_3.8.7/docker-foxx.sh
copy to arangodb_3.9.3/docker-foxx.sh
diff --git a/arangodb_latest/Dockerfile b/arangodb_latest/Dockerfile
index 4ea1dab..92eafcf 100644
--- a/arangodb_latest/Dockerfile
+++ b/arangodb_latest/Dockerfile
@@ -1,15 +1,11 @@
-FROM alpine:3.14
+FROM alpine:3.16
MAINTAINER Frank Celler <info@arangodb.com>
-ENV ARANGO_VERSION 3.9.3
-ENV ARANGO_URL https://download.arangodb.com/arangodb39/DEBIAN/amd64
-ENV ARANGO_PACKAGE arangodb3_${ARANGO_VERSION}-1_amd64.deb
-ENV ARANGO_PACKAGE_URL ${ARANGO_URL}/${ARANGO_PACKAGE}
-ENV ARANGO_SIGNATURE_URL ${ARANGO_PACKAGE_URL}.asc
+ENV ARANGO_VERSION 3.10.0
# see
-# https://www.arangodb.com/docs/3.9/programs-arangod-server.html#managing-endpoints
-# https://www.arangodb.com/docs/3.9/programs-arangod-log.html
+# https://www.arangodb.com/docs/3.10/programs-arangod-server.html#managing-endpoints
+# https://www.arangodb.com/docs/3.10/programs-arangod-log.html
RUN apk add --no-cache gnupg pwgen binutils numactl numactl-tools nodejs yarn && \
yarn global add foxx-cli@2.0.1 && \
@@ -17,6 +13,16 @@ RUN apk add --no-cache gnupg pwgen binutils numactl numactl-tools nodejs yarn &&
gpg --batch --keyserver keys.openpgp.org --recv-keys CD8CB0F1E0AD5B52E93F41E7EA93F5E56E751E9B && \
mkdir /docker-entrypoint-initdb.d && \
cd /tmp && \
+ arch="$(apk --print-arch)" && \
+ case "$arch" in \
+ x86_64) dpkgArch='amd64' ;; \
+ aarch64) dpkgArch='arm64' ;; \
+ *) echo >&2 "unsupported: $arch" && exit 1 ;; \
+ esac && \
+ ARANGO_URL="https://download.arangodb.com/arangodb310/DEBIAN/$dpkgArch" && \
+ ARANGO_PACKAGE="arangodb3_${ARANGO_VERSION}-1_${dpkgArch}.deb" && \
+ ARANGO_PACKAGE_URL="${ARANGO_URL}/${ARANGO_PACKAGE}" && \
+ ARANGO_SIGNATURE_URL="${ARANGO_PACKAGE_URL}.asc" && \
wget ${ARANGO_SIGNATURE_URL} && \
wget ${ARANGO_PACKAGE_URL} && \
gpg --verify ${ARANGO_PACKAGE}.asc && \Relevant Maintainers:
|
|
Looks good, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added ArangoDB 3.10 (3.10.0).