Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update library/liquibase to 4.31.0 #18311

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Conversation

liquibot
Copy link
Contributor

Update library/liquibase with latest commit and version

@liquibot liquibot requested a review from a team as a code owner January 24, 2025 19:43

This comment has been minimized.

@LaurentGoderre
Copy link
Member

It's not ideal to do such change not on a version bump

@jnewton03
Copy link

It's not ideal to do such change not on a version bump

Hi @LaurentGoderre , I agree, but in this case we found the bug after the liquibase 4.31.0 binary went out and we try to stay in sync with the version number. Can we make this exception? It has been tested and approved by our QA team.

@yosifkit
Copy link
Member

I think the Dockerfile diffs are reasonable. 👍


Can you clean up your branch by doing a rebase on official-images/master followed by a force push? I can do a "squash and merge", but that will continue to diverge the branches. For future bot PRs I recommend starting from a fresh fetch of official-images/master rather than any local state or fork branches.

Some helpful links:

This comment has been minimized.

Copy link

Diff for 2494a97:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2d1b2ca..e43a833 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -4,9 +4,9 @@ GitRepo: https://github.com/liquibase/docker.git
 
 Tags: 4.31, 4.31.0, latest
 GitFetch: refs/heads/main
-GitCommit: ff5441b137e517f983ab09869f3b1a956f0c839a
+GitCommit: e348326855672a5d20d1789cfdab1ac8b2a6afa2
 
 Tags: 4.31-alpine, 4.31.0-alpine, alpine
 GitFetch: refs/heads/main
-GitCommit: ff5441b137e517f983ab09869f3b1a956f0c839a
+GitCommit: e348326855672a5d20d1789cfdab1ac8b2a6afa2
 File: Dockerfile.alpine
diff --git a/liquibase_alpine/Dockerfile.alpine b/liquibase_alpine/Dockerfile.alpine
index d6c1368..f491bf4 100644
--- a/liquibase_alpine/Dockerfile.alpine
+++ b/liquibase_alpine/Dockerfile.alpine
@@ -1,10 +1,10 @@
 # Use multi-stage build
-FROM alpine:3.20
+FROM alpine:3.21
 
 # Create liquibase user
 RUN addgroup --gid 1001 liquibase && \
-    adduser --disabled-password --uid 1001 --ingroup liquibase liquibase && \
-    mkdir /liquibase && chown liquibase /liquibase
+    adduser --disabled-password --uid 1001 --ingroup liquibase --home /liquibase liquibase && \
+    chown liquibase /liquibase
 
 # Install smaller JRE, if available and acceptable
 RUN apk add --no-cache openjdk17-jre-headless bash
diff --git a/liquibase_latest/Dockerfile b/liquibase_latest/Dockerfile
index 25c1e98..19d19b0 100644
--- a/liquibase_latest/Dockerfile
+++ b/liquibase_latest/Dockerfile
@@ -3,8 +3,8 @@ FROM eclipse-temurin:17-jre-jammy
 
 # Create liquibase user
 RUN groupadd --gid 1001 liquibase && \
-    useradd --uid 1001 --gid liquibase liquibase && \
-    mkdir /liquibase && chown liquibase /liquibase
+    useradd --uid 1001 --gid liquibase --create-home --home-dir /liquibase liquibase && \
+    chown liquibase /liquibase
 
 # Install necessary dependencies
 #RUN apt-get update && \

Relevant Maintainers:

@jnewton03
Copy link

I think the Dockerfile diffs are reasonable. 👍

Can you clean up your branch by doing a rebase on official-images/master followed by a force push? I can do a "squash and merge", but that will continue to diverge the branches. For future bot PRs I recommend starting from a fresh fetch of official-images/master rather than any local state or fork branches.

Some helpful links:

* https://git-scm.com/book/en/v2/Git-Branching-Rebasing

* https://github.com/servo/servo/wiki/Beginner's-guide-to-rebasing-and-squashing#rebasing

* https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase

* [Update for Node.js 0.10.36 #426 (comment)](https://github.com/docker-library/official-images/pull/426#issuecomment-71550895)

* [Add new version (7.3.3) of Bonita BPM #2245 (comment)](https://github.com/docker-library/official-images/pull/2245#issuecomment-253361575)

@sayaliM0412 rebased this. Does it look okay now @LaurentGoderre @yosifkit ?

Copy link
Member

@yosifkit yosifkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sayaliM0412 rebased this. Does it look okay now @LaurentGoderre @yosifkit ?

Yes, LGTM!

@yosifkit yosifkit merged commit da1fb84 into docker-library:master Jan 28, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants