Skip to content

Commit

Permalink
Use hub.docker.com ddev org instead of drud org (#5)
Browse files Browse the repository at this point in the history
  • Loading branch information
rfay authored Apr 15, 2023
1 parent b68a1b7 commit 289ee41
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions 5.7/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

set -eu -o pipefail

MINORVERSION=${BASE:-drud/mysql:$(cat base_version.txt)}
MINORVERSION=${BASE:-ddev/mysql:$(cat base_version.txt)}
MAJORVERSION=${MINORVERSION%.*}

set -x
# Build only current architecture and load into docker
docker buildx build --target=mysql -t ${MINORVERSION} -t ${MAJORVERSION} --load .
docker buildx build --target=mysql -t ${MINORVERSION} -t ${MAJORVERSION} --load .
4 changes: 2 additions & 2 deletions 5.7/push.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
set -eu -o pipefail

MINORVERSION=${BASE:-drud/mysql:$(cat base_version.txt)}
MINORVERSION=${BASE:-ddev/mysql:$(cat base_version.txt)}
MAJORVERSION=${MINORVERSION%.*}

echo "Pushing mysql:$MINORVERSION"
set -x
# Build only current architecture and load into docker
docker buildx build --target=mysql -t ${MINORVERSION} -t ${MAJORVERSION} --push --platform=linux/arm64,linux/amd64 .
docker buildx build --target=mysql -t ${MINORVERSION} -t ${MAJORVERSION} --push --platform=linux/arm64,linux/amd64 .
2 changes: 1 addition & 1 deletion 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN if [ "$(arch)" = "x86_64" ]; then \

# But if we still don't have it (arm64)
RUN if ! command -v xtrabackup; then \
URL="https://github.com/drud/xtrabackup-build/releases/download/${XTRABACKUP_PACKAGE_VERSION%-*}/xtrabackup-${XTRABACKUP_PACKAGE_VERSION%-*}-arm64.tar.gz" && \
URL="https://github.com/ddev/xtrabackup-build/releases/download/${XTRABACKUP_PACKAGE_VERSION%-*}/xtrabackup-${XTRABACKUP_PACKAGE_VERSION%-*}-arm64.tar.gz" && \
cd /tmp && \
wget ${URL} && \
wget ${URL}.sha256.txt && \
Expand Down
4 changes: 2 additions & 2 deletions 8.0/build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/bash
set -eu -o pipefail

REPO_NAME=drud/mysql
REPO_NAME=ddev/mysql
MYSQL_PACKAGE_VERSION=$(cat mysql_version.txt)
MYSQL_MINOR=${MYSQL_PACKAGE_VERSION%%-*}
MYSQL_MAJOR=${MYSQL_MINOR%.*}
XTRABACKUP_PACKAGE_VERSION=$(cat xtrabackup_version.txt)

set -x
# Build only current architecture and load into docker
docker buildx build --progress plain --no-cache --build-arg=XTRABACKUP_PACKAGE_VERSION="${XTRABACKUP_PACKAGE_VERSION}" --build-arg="MYSQL_PACKAGE_VERSION=${MYSQL_PACKAGE_VERSION}" --target=mysql -t ${REPO_NAME}:${MYSQL_MAJOR} -t ${REPO_NAME}:${MYSQL_MINOR} .
docker buildx build --progress plain --no-cache --build-arg=XTRABACKUP_PACKAGE_VERSION="${XTRABACKUP_PACKAGE_VERSION}" --build-arg="MYSQL_PACKAGE_VERSION=${MYSQL_PACKAGE_VERSION}" --target=mysql -t ${REPO_NAME}:${MYSQL_MAJOR} -t ${REPO_NAME}:${MYSQL_MINOR} .
2 changes: 1 addition & 1 deletion 8.0/push.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -eu -o pipefail

REPO_NAME=drud/mysql
REPO_NAME=ddev/mysql
MYSQL_PACKAGE_VERSION=$(cat mysql_version.txt)
MYSQL_MINOR=${MYSQL_PACKAGE_VERSION%%-*}
MYSQL_MAJOR=${MYSQL_MINOR%.*}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# mysql-arm64-images
Build tools for mysql arm64 images

Oracle does not publish any arm64 images for mysql, but people on mac M1 ([ddev](github.com/drud/ddev)) certainly need native images.
Oracle does not publish any arm64 images for mysql, but people on mac M1 ([ddev](github.com/ddev/ddev)) certainly need native images.

This repo is used for publishing those images.

Expand All @@ -17,7 +17,7 @@ To do this, for both PLATFORM=linux/amd64 and PLATFORM=linux/arm64, `docker run
* In the proper directory, use `push.sh` to push or `build.sh` to test a build.
* When a new minor version of mysql is released, update the proper base_version.txt
* Note that mysql 8.0 should only be updated to a new minor version *after* the xtrabackup-8.0 version that supports it (that has the same or higher major version)
* xtrabackup-8.0 is built for arm64 in [xtrabackup-build](https://github.com/drud/xtrabackup-build), so you'll need a new release there if a new release for mysql 8.0 comes out, because xtrabackup-8.0 always has to be at least the version of mysql 8.0
* xtrabackup-8.0 is built for arm64 in [xtrabackup-build](https://github.com/ddev/xtrabackup-build), so you'll need a new release there if a new release for mysql 8.0 comes out, because xtrabackup-8.0 always has to be at least the version of mysql 8.0
* So before updating mysql 8.0, change `files/install/mysql-server`, `files/install/percona-xtrabackup80`, `mysql_version.txt`, and `xtrabackup_version.txt` to the correct versions.
* Then create a new release. The proper tags will be pushed for drud/mysql:5.7 and drud/mysql:8.0
* Then create a new release. The proper tags will be pushed for ddev/mysql:5.7 and ddev/mysql:8.0

0 comments on commit 289ee41

Please sign in to comment.