From ad662c15d5ed795c2cb3cf076f4ad4c39ba292ec Mon Sep 17 00:00:00 2001 From: Don <32144818+Don-Swanson@users.noreply.github.com> Date: Fri, 24 Nov 2023 14:14:09 -0600 Subject: [PATCH] Updates to Dockerfile --- .github/workflows/docker-publish.yml | 13 +++---------- Dockerfile | 2 +- docker-compose.yml | 11 +++++++++++ 3 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 docker-compose.yml diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 4b9d7e9..c46822c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -1,20 +1,14 @@ name: Docker -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - on: schedule: - cron: '27 4 * * 1' push: branches: [ "main" ] # Publish semver tags as releases. - tags: [ 'latest', 'v*.*.*'] + tags: [ 'latest' ] pull_request: branches: [ "main"] - tags: [ 'latest', 'v*.*.*'] env: # Use docker.io for Docker Hub if empty @@ -22,7 +16,6 @@ env: # github.repository as / IMAGE_NAME: ${{ github.repository }} - jobs: build: @@ -79,7 +72,7 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.meta.outputs.tags }} + tags: don-swanson/postfix:latest labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max @@ -93,7 +86,7 @@ jobs: if: ${{ github.event_name != 'pull_request' }} env: # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable - TAGS: ${{ steps.meta.outputs.tags }} + TAGS: don-swanson/postfix:latest DIGEST: ${{ steps.build-and-push.outputs.digest }} # This step uses the identity token to provision an ephemeral certificate # against the sigstore community Fulcio instance. diff --git a/Dockerfile b/Dockerfile index 1d75276..cf39fb1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG VERSION=unspecified +ARG VERSION=latest FROM debian:bullseye-slim diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..d860bf9 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: "2.1" +services: + postfix: + image: ghcr.io/don-swanson/postfix:main + container_name: postfix + volumes: + - ./postfix-config:/config + ports: + - 25:25 + - 587:587 + restart: unless-stopped \ No newline at end of file