Skip to content

Commit

Permalink
Merge pull request #234 from liquibase/842ddependabot/docker/alpine-3…
Browse files Browse the repository at this point in the history
….18.3

build(deps): bump alpine from 3.18.2 to 3.18.3
  • Loading branch information
jandroav authored Aug 29, 2023
2 parents b0c20f6 + 4d4a04f commit 8a537a7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ ARG LB_SHA256=b9667d97a0ba425547aa9fe66bafeccf4ef3b821e91ae732ec684d0eaf2fd7f5

# Install necessary dependencies
RUN apt-get update && \
apt-get upgrade -y && \
apt-get -yqq install krb5-user libpam-krb5 gnupg wget unzip --no-install-recommends && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -27,7 +26,7 @@ RUN mkdir bin && \
esac && wget -v -O lpm.zip "https://github.com/liquibase/liquibase-package-manager/releases/download/v${LPM_VERSION}/lpm-${LPM_VERSION}-linux${DOWNLOAD_ARCH}.zip" && \
unzip lpm.zip -d bin/ && \
rm lpm.zip

# Production Stage
FROM eclipse-temurin:17-jre-jammy as production

Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.alpine
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use multi-stage build
FROM alpine:3.18.2 as builder
FROM alpine:3.18.3 as builder

ARG TARGETARCH
ARG LIQUIBASE_VERSION=4.23.1
Expand Down Expand Up @@ -28,7 +28,7 @@ RUN mkdir /liquibase/bin && \
rm lpm.zip

# Final Image
FROM alpine:3.18.2
FROM alpine:3.18.3

# Install smaller JRE, if available and acceptable
RUN apk add --no-cache openjdk17-jre-headless bash
Expand Down
4 changes: 2 additions & 2 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ if [[ "$1" != "history" ]] && type "$1" > /dev/null 2>&1; then
else
if [[ "$*" == *--defaultsFile* ]] || [[ "$*" == *--defaults-file* ]] || [[ "$*" == *--version* ]]; then
## Just run as-is
/liquibase/liquibase "$@"
exec /liquibase/liquibase "$@"
else
## Include standard defaultsFile
/liquibase/liquibase "--defaultsFile=/liquibase/liquibase.docker.properties" "$@"
exec /liquibase/liquibase "--defaultsFile=/liquibase/liquibase.docker.properties" "$@"
fi
fi

0 comments on commit 8a537a7

Please sign in to comment.