From 07b3d5d9047873f646ca2fafadfeaf03efd96588 Mon Sep 17 00:00:00 2001 From: Devon McCarty Date: Wed, 6 Mar 2024 13:55:08 -0500 Subject: [PATCH 1/3] Switch to GitHub Actions. --- .github/workflows/build-and-publish.yml | 32 +++++++++++++++++++++++++ codeship-services.yml | 5 ---- codeship-steps.yml | 18 -------------- dockercfg.encrypted | 2 -- 4 files changed, 32 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/build-and-publish.yml delete mode 100644 codeship-services.yml delete mode 100644 codeship-steps.yml delete mode 100644 dockercfg.encrypted diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml new file mode 100644 index 0000000..65d09e0 --- /dev/null +++ b/.github/workflows/build-and-publish.yml @@ -0,0 +1,32 @@ +name: Build and Publish + +on: + push: + +jobs: + build-and-publish: + name: Build and Publish + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ vars.DOCKER_ORG }}/${{ github.event.repository.name }} + + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/codeship-services.yml b/codeship-services.yml deleted file mode 100644 index 42f1ca6..0000000 --- a/codeship-services.yml +++ /dev/null @@ -1,5 +0,0 @@ -app: - build: - image: silintl/postgresql-backup-restore - dockerfile: ./Dockerfile - cached: true diff --git a/codeship-steps.yml b/codeship-steps.yml deleted file mode 100644 index e3de734..0000000 --- a/codeship-steps.yml +++ /dev/null @@ -1,18 +0,0 @@ -- name: push_branch - service: app - type: push - image_name: silintl/postgresql-backup-restore - image_tag: "{{.Branch}}" - exclude: (master|main|snyk*) - registry: https://index.docker.io/v1/ - encrypted_dockercfg_path: dockercfg.encrypted - -- name: push_latest - service: app - type: push - image_name: silintl/postgresql-backup-restore - image_tag: "latest" - tag: master - registry: https://index.docker.io/v1/ - encrypted_dockercfg_path: dockercfg.encrypted - diff --git a/dockercfg.encrypted b/dockercfg.encrypted deleted file mode 100644 index 9c80a15..0000000 --- a/dockercfg.encrypted +++ /dev/null @@ -1,2 +0,0 @@ -codeship:v2 -NMieutpfoDvbRe5I0XlA6m7Eh4hb1ZsL4Di/XD/z6uBK5PMZmii7ZBXM1i7777TUgnQ8ysNmEDICzp0r2uG4ExqkGUdghhN8lIg46uRoVnM0a8Q9qvhwWxCY963ql+QojbgZPm1KrPbxYNC74Y1cibxUCpC4pdclkMCMQ8FZOEKHbBd6IfYKBnBfgBNElWhwUgBinDk2RCx3eZM/7rdqLvuxLAGapoEGIeorcPuEYehb3BizCdnIAAouNxDobU4sXo8ONp0nuZM2tJfD1omiXcmerkmvaZV8xwpIMbLXhbQ6SrAN0kCdBmJwYGwq \ No newline at end of file From 5dd88fb859909a79d737417ad1e6f263b9210333 Mon Sep 17 00:00:00 2001 From: Devon McCarty Date: Wed, 6 Mar 2024 13:55:19 -0500 Subject: [PATCH 2/3] Upgrade to postgres 14. --- Dockerfile | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d52f37a..d94f65b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/reposito RUN apk update \ && apk add --no-cache \ bash \ - postgresql12-client \ + postgresql14-client \ py3-magic \ py3-dateutil \ s3cmd diff --git a/docker-compose.yml b/docker-compose.yml index 05d5f61..1d39abc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: # POSTGRES_USER - superuser (default is 'postgres') # POSTGRES_DB - name of default database (default is value of POSTGRES_USER) db: - image: postgres:11.15-alpine3.15 + image: postgres:14.11-alpine3.19 volumes_from: - data ports: From b7cb71ec7cde8cb1ca0e844ee113729fd8c60875 Mon Sep 17 00:00:00 2001 From: Devon McCarty Date: Wed, 6 Mar 2024 15:13:09 -0500 Subject: [PATCH 3/3] Remove codeship references in dockerignore. --- .dockerignore | 2 -- 1 file changed, 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index f1d320d..b6cf10a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,2 @@ *.aes -codeship-services.yml -codeship-steps.yml dockercfg