From 23cf857487cd668c1e3d16a8cf10570825a9cc50 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 04:30:04 +0000
Subject: [PATCH 1/5] Bump alpine from 3.20.2 to 3.20.3
Bumps alpine from 3.20.2 to 3.20.3.
---
updated-dependencies:
- dependency-name: alpine
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
---
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 0c0de4c..51fbf16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV GO111MODULE=on
RUN go mod tidy
RUN CGO_ENABLED=0 GOOS=linux GO111MODULE=on go build -a -o /go/bin/dockerize .
-FROM alpine:3.20.2
+FROM alpine:3.20.3
LABEL maintainer "Fco. Javier Delgado del Hoyo <frandelhoyo@gmail.com>"
RUN apk add --update \
From 353430ff83f7177125f011fdc7068d2c6af6279f Mon Sep 17 00:00:00 2001
From: "Fco. Javier Delgado del Hoyo" <frandelhoyo@gmail.com>
Date: Tue, 10 Sep 2024 19:25:10 +0200
Subject: [PATCH 2/5] move to docker v2
---
.github/workflows/image.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index 1fe4d25..d1b827f 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -22,10 +22,10 @@ jobs:
DATABASE_NAME: foo
MARIADB_ROOT_PASSWORD: abcd
run: |
- docker-compose up -d mariadb
- docker-compose run backup /backup.sh
- docker-compose run backup /restore.sh /backup/latest.foo.sql.gz
- docker-compose stop
+ docker compose up -d mariadb
+ docker compose run backup /backup.sh
+ docker compose run backup /restore.sh /backup/latest.foo.sql.gz
+ docker compose stop
build:
runs-on: ubuntu-22.04
needs: test
@@ -50,4 +50,4 @@ jobs:
run: |
docker buildx build --push \
--tag fradelg/mysql-cron-backup:${{ steps.docker-tag.outputs.tag }} \
- --platform linux/amd64,linux/arm/v7,linux/arm64 .
\ No newline at end of file
+ --platform linux/amd64,linux/arm/v7,linux/arm64 .
From 07213e81358665a17117297f95104898989d0958 Mon Sep 17 00:00:00 2001
From: "Fco. Javier Delgado del Hoyo" <frandelhoyo@gmail.com>
Date: Tue, 10 Sep 2024 19:37:59 +0200
Subject: [PATCH 3/5] use service name for dns
---
docker-compose.yaml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d0b693f..e154335 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,7 +2,6 @@ version: "2"
services:
mariadb:
image: mariadb:10
- container_name: my_mariadb
expose:
- 3306
volumes:
@@ -21,7 +20,7 @@ services:
volumes:
- ${VOLUME_PATH}/backup:/backup
environment:
- - MYSQL_HOST=my_mariadb
+ - MYSQL_HOST=mariadb
- MYSQL_USER=root
- MYSQL_PASS=${MARIADB_ROOT_PASSWORD}
- MAX_BACKUPS=1
@@ -30,4 +29,4 @@ services:
restart: unless-stopped
volumes:
- data:
\ No newline at end of file
+ data:
From a715b4946cd805a0f26aba557b721904696e8c66 Mon Sep 17 00:00:00 2001
From: "Fco. Javier Delgado del Hoyo" <frandelhoyo@gmail.com>
Date: Tue, 10 Sep 2024 19:47:30 +0200
Subject: [PATCH 4/5] add health check
---
docker-compose.yaml | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e154335..6dfbf75 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -2,6 +2,7 @@ version: "2"
services:
mariadb:
image: mariadb:10
+ container_name: my_mariadb
expose:
- 3306
volumes:
@@ -10,17 +11,23 @@ services:
environment:
- MYSQL_DATABASE=${DATABASE_NAME}
- MYSQL_ROOT_PASSWORD=${MARIADB_ROOT_PASSWORD}
+ - MYSQL_ALLOW_EMPTY_ROOT_PASSWORD=yes
restart: unless-stopped
+ healthcheck:
+ test: ["CMD", "healthcheck.sh", "--su-mysql", "--connect"]
+ timeout: 5s
+ retries: 10
backup:
build: .
image: fradelg/mysql-cron-backup
depends_on:
- - mariadb
+ mariadb:
+ condition: service_healthy
volumes:
- ${VOLUME_PATH}/backup:/backup
environment:
- - MYSQL_HOST=mariadb
+ - MYSQL_HOST=my_mariadb
- MYSQL_USER=root
- MYSQL_PASS=${MARIADB_ROOT_PASSWORD}
- MAX_BACKUPS=1
From dac06953c32e804bf39f6599dc6fc14f4c123464 Mon Sep 17 00:00:00 2001
From: "Fco. Javier Delgado del Hoyo" <frandelhoyo@gmail.com>
Date: Tue, 10 Sep 2024 19:52:19 +0200
Subject: [PATCH 5/5] do not mask docker username
---
.github/workflows/image.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml
index d1b827f..5827146 100644
--- a/.github/workflows/image.yml
+++ b/.github/workflows/image.yml
@@ -44,7 +44,7 @@ jobs:
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
- username: ${{ secrets.DOCKER_USERNAME }}
+ username: fradelg
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Build multiarch image
run: |