Skip to content

Commit

Permalink
Use eclipse-temurin base image in Dockerfile (#1826)
Browse files Browse the repository at this point in the history
  • Loading branch information
kota2and3kan committed Jun 10, 2024
1 parent 6f2c20f commit 8ca3a3b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion ci/dockerfile_lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -e -o pipefail; [[ -n "$DEBUG" ]] && set -x

HADOLINT_VERSION="v1.19.0"
HADOLINT_VERSION="v2.12.0"
HADOLINT="${HADOLINT:-docker run --rm -i -v "$(pwd):/mnt" -w "/mnt" "hadolint/hadolint:${HADOLINT_VERSION}" hadolint}"

exec ${HADOLINT} ./Dockerfile
5 changes: 4 additions & 1 deletion schema-loader/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM ghcr.io/scalar-labs/jre8:1.1.16
FROM eclipse-temurin:8-jre-jammy

RUN apt-get update && apt-get upgrade -y \
&& rm -rf /var/lib/apt/lists/*

COPY scalardb-schema-loader-*.jar /app.jar

Expand Down
5 changes: 4 additions & 1 deletion server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,10 @@ RUN set -x && \
tar -xzvf "dockerize-linux-amd64-${DOCKERIZE_VERSION}.tar.gz" && \
./dockerize --version

FROM ghcr.io/scalar-labs/jre8:1.1.16
FROM eclipse-temurin:8-jre-jammy

RUN apt-get update && apt-get upgrade -y \
&& rm -rf /var/lib/apt/lists/*

COPY --from=tools dockerize /usr/local/bin/
COPY --from=tools grpc_health_probe /usr/local/bin/
Expand Down

0 comments on commit 8ca3a3b

Please sign in to comment.