refactor: standardize image names

This commit is contained in:
Marc 2024-11-07 13:48:56 -05:00
parent d927b68005
commit e96e611d43
Signed by: marc
GPG key ID: 048E042F22B5DC79
2 changed files with 10 additions and 10 deletions

View file

@ -33,12 +33,12 @@ jobs:
- name: Push tagged images to registry - name: Push tagged images to registry
if: ${{ github.event_name == 'push' }} if: ${{ github.event_name == 'push' }}
run: | run: |
podman push localhost/sesame-caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:latest podman push localhost/sesame/caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:latest
podman push localhost/sesame-caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ steps.image-metadata.outputs.image-tag }} podman push localhost/sesame/caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ steps.image-metadata.outputs.image-tag }}
podman push localhost/sesame-caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ github.ref_name }} podman push localhost/sesame/caddy:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/caddy:${{ github.ref_name }}
podman push localhost/sesame-promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:latest podman push localhost/sesame/promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:latest
podman push localhost/sesame-promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ steps.image-metadata.outputs.image-tag }} podman push localhost/sesame/promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ steps.image-metadata.outputs.image-tag }}
podman push localhost/sesame-promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ github.ref_name }} podman push localhost/sesame/promtail:latest ${{ vars.REGISTRY_ENDPOINT }}/sesame/promtail:${{ github.ref_name }}
post-run: post-run:
runs-on: imagefactory-latest runs-on: imagefactory-latest
needs: [build] needs: [build]

View file

@ -2,9 +2,9 @@ name: sesame
build: build:
images: images:
- path: ./caddy.Dockerfile - path: ./caddy.Dockerfile
tag: sesame-caddy tag: sesame/caddy
- path: ./promtail.Dockerfile - path: ./promtail.Dockerfile
tag: sesame-promtail tag: sesame/promtail
ports: ports:
# Reverse proxied ports. # Reverse proxied ports.
- host: 53000 - host: 53000
@ -26,7 +26,7 @@ volumes:
- name: caddy-logs - name: caddy-logs
containers: containers:
- name: caddy - name: caddy
image: sesame-caddy:latest image: sesame/caddy:latest
env-file: /etc/opt/spadinastan/sesame.env env-file: /etc/opt/spadinastan/sesame.env
volumes: volumes:
- name: caddy-data - name: caddy-data
@ -36,7 +36,7 @@ containers:
- name: caddy-logs - name: caddy-logs
container: /var/log/caddy container: /var/log/caddy
- name: promtail - name: promtail
image: sesame-promtail:latest # Updated: 11/6/2024 image: sesame/promtail:latest # Updated: 11/6/2024
volumes: volumes:
- name: caddy-logs - name: caddy-logs
container: /var/caddy-logs container: /var/caddy-logs