diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 1fe4d25..5827146 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 @@ -44,10 +44,10 @@ 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: | 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 . 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 \ diff --git a/docker-compose.yaml b/docker-compose.yaml index d0b693f..6dfbf75 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,13 +11,19 @@ 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: @@ -30,4 +36,4 @@ services: restart: unless-stopped volumes: - data: \ No newline at end of file + data: