Merge pull request #182 from TheSpaceDevs/development

More work on release automation

Author: derkweijers

.github/workflows/development.yml

@@ -41,4 +41,4 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            RELEASE_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}

.github/workflows/production.yml

@@ -35,8 +35,8 @@ jobs:
         id: docker_build
         uses: docker/build-push-action@v4
         with:
-          push: false
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            RELEASE_VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}

Dockerfile

@@ -17,7 +17,7 @@ FROM python:3.11
 LABEL org.opencontainers.image.source https://github.com/TheSpaceDevs/spaceflightnewsapi
 
 ARG RELEASE_VERSION
-ENV VERSION=$RELEASE_VERSION
+ENV SNAPI_VERSION=$RELEASE_VERSION
 
 WORKDIR /code/
 COPY --from=builder /code /code

docker-compose.dev.yml

@@ -15,7 +15,7 @@ services:
     ports:
       - "8000:8000"
     environment:
-      - VERSION=${VERSION}
+      - SNAPI_VERSION=${SNAPI_VERSION}
       - DEBUG=${DEBUG}
       - SECRET_KEY=${SECRET_KEY}
       - DB_NAME=${DB_NAME}
@@ -62,7 +62,7 @@ services:
       - ./snapy:/code/snapy
       - ./manage.py:/code/manage.py
     environment:
-      - VERSION=${VERSION}
+      - SNAPI_VERSION=${SNAPI_VERSION}
       - DB_NAME=${DB_NAME}
       - DB_USER=${DB_USER}
       - DB_HOST=${DB_HOST}
@@ -84,7 +84,7 @@ services:
       - ./snapy:/code/snapy
       - ./manage.py:/code/manage.py
     environment:
-      - VERSION=${VERSION}
+      - SNAPI_VERSION=${SNAPI_VERSION}
       - DB_NAME=${DB_NAME}
       - DB_USER=${DB_USER}
       - DB_HOST=${DB_HOST}

snapy/settings.py

@@ -17,7 +17,7 @@
 import sentry_sdk
 from sentry_sdk.integrations.django import DjangoIntegration
 
-VERSION = os.getenv("VERSION")
+VERSION = os.getenv("SNAPI_VERSION")
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent