Merge pull request #1565 from nationalarchives/fix/inconsistent-capit…

…alisation-docker

Fix inconsistent capitalisation errors in dockerfiles

Dockerfile

@@ -3,10 +3,10 @@ ARG PYTHON_VERSION=3.12-slim-bookworm
 
 
 # define an alias for the specfic python version used in this file.
-FROM python:${PYTHON_VERSION} as python
+FROM python:${PYTHON_VERSION} AS python
 
 # Python build stage
-FROM python as python-build-stage
+FROM python AS python-build-stage
 
 ARG BUILD_ENVIRONMENT=production
 
@@ -26,7 +26,7 @@ RUN pip wheel --wheel-dir /usr/src/app/wheels  \
 
 
 # Python 'run' stage
-FROM python as python-run-stage
+FROM python AS python-run-stage
 
 ARG BUILD_ENVIRONMENT=production
 ARG APP_HOME=/app

compose/local/django/Dockerfile

@@ -1,10 +1,10 @@
 ARG PYTHON_VERSION=3.12-slim-bullseye
 
 # define an alias for the specfic python version used in this file.
-FROM python:${PYTHON_VERSION} as python
+FROM python:${PYTHON_VERSION} AS python
 
 # Python build stage
-FROM python as python-build-stage
+FROM python AS python-build-stage
 
 ARG BUILD_ENVIRONMENT=local
 
@@ -24,7 +24,7 @@ RUN pip wheel --wheel-dir /usr/src/app/wheels  \
 
 
 # Python 'run' stage
-FROM python as python-run-stage
+FROM python AS python-run-stage
 
 ARG BUILD_ENVIRONMENT=local
 ARG APP_HOME=/app

compose/local/docs/Dockerfile

@@ -1,11 +1,11 @@
 ARG PYTHON_VERSION=3.12-slim-bullseye
 
 # define an alias for the specfic python version used in this file.
-FROM python:${PYTHON_VERSION} as python
+FROM python:${PYTHON_VERSION} AS python
 
 
 # Python build stage
-FROM python as python-build-stage
+FROM python AS python-build-stage
 
 ENV PYTHONDONTWRITEBYTECODE 1
 
@@ -28,7 +28,7 @@ RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
 
 
 # Python 'run' stage
-FROM python as python-run-stage
+FROM python AS python-run-stage
 
 ARG BUILD_ENVIRONMENT
 ENV PYTHONUNBUFFERED 1

compose/production/django/Dockerfile

@@ -3,10 +3,10 @@ ARG PYTHON_VERSION=3.12-slim-bullseye
 
 
 # define an alias for the specfic python version used in this file.
-FROM python:${PYTHON_VERSION} as python
+FROM python:${PYTHON_VERSION} AS python
 
 # Python build stage
-FROM python as python-build-stage
+FROM python AS python-build-stage
 
 ARG BUILD_ENVIRONMENT=production
 
@@ -26,7 +26,7 @@ RUN pip wheel --wheel-dir /usr/src/app/wheels  \
 
 
 # Python 'run' stage
-FROM python as python-run-stage
+FROM python AS python-run-stage
 
 ARG BUILD_ENVIRONMENT=production
 ARG APP_HOME=/app

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.1"
-
 services:
   django:
     platform: linux/amd64

production.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   production_postgres_data: {}
   production_postgres_data_backups: {}

test.yml

@@ -1,5 +1,3 @@
-version: "3"
-
 volumes:
   ds_caselaw_editor_ui_local_postgres_data: {}
   ds_caselaw_editor_ui_local_postgres_data_backups: {}