Skip to content

Commit

Permalink
Update MariaDB entrypoint script check
Browse files Browse the repository at this point in the history
  • Loading branch information
mserajnik committed Nov 5, 2024
1 parent c6c6be3 commit 89292d8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-docker-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
- name: Check if MariaDB entrypoint script has been updated
id: mariadb-entrypoint-check
run: |
known_entrypoint=https://raw.githubusercontent.com/MariaDB/mariadb-docker/70d5dbb8052e1d67f69ac25783537afd457afa34/11.4/docker-entrypoint.sh
known_entrypoint=https://raw.githubusercontent.com/MariaDB/mariadb-docker/64252135052f269ed2bb57134ad73537e93b7ab6/11.4/docker-entrypoint.sh
latest_entrypoint=https://raw.githubusercontent.com/MariaDB/mariadb-docker/master/11.4/docker-entrypoint.sh
curl -o known-entrypoint.sh $known_entrypoint
curl -o latest-entrypoint.sh $latest_entrypoint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-testing-docker-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- name: Check if MariaDB entrypoint script has been updated
id: mariadb-entrypoint-check
run: |
known_entrypoint=https://raw.githubusercontent.com/MariaDB/mariadb-docker/70d5dbb8052e1d67f69ac25783537afd457afa34/11.4/docker-entrypoint.sh
known_entrypoint=https://raw.githubusercontent.com/MariaDB/mariadb-docker/64252135052f269ed2bb57134ad73537e93b7ab6/11.4/docker-entrypoint.sh
latest_entrypoint=https://raw.githubusercontent.com/MariaDB/mariadb-docker/master/11.4/docker-entrypoint.sh
curl -o known-entrypoint.sh $known_entrypoint
curl -o latest-entrypoint.sh $latest_entrypoint
Expand Down
2 changes: 1 addition & 1 deletion docker/database/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ ENV VMANGOS_REALMLIST_PORT=8085
ENV VMANGOS_REALMLIST_ICON=1
ENV VMANGOS_REALMLIST_TIMEZONE=0
ENV VMANGOS_REALMLIST_ALLOWED_SECURITY_LEVEL=0
# See https://github.com/MariaDB/mariadb-docker/blob/70d5dbb8052e1d67f69ac25783537afd457afa34/11.4/docker-entrypoint.sh#L596-L600
# See https://github.com/MariaDB/mariadb-docker/blob/64252135052f269ed2bb57134ad73537e93b7ab6/11.4/docker-entrypoint.sh#L594-L598
ENV MARIADB_AUTO_UPGRADE=1

COPY --from=setup /sql /sql
Expand Down
2 changes: 1 addition & 1 deletion docker/database/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# This entrypoint script is based on
# https://github.com/MariaDB/mariadb-docker/blob/70d5dbb8052e1d67f69ac25783537afd457afa34/11.4/docker-entrypoint.sh
# https://github.com/MariaDB/mariadb-docker/blob/64252135052f269ed2bb57134ad73537e93b7ab6/11.4/docker-entrypoint.sh
# and might need to get adjusted when the original script gets updated.
# Formatting, comments and commented out code from the original script have
# been preserved, where possible, to make it easier to compare this script to
Expand Down

0 comments on commit 89292d8

Please sign in to comment.