Skip to content

Commit

Permalink
Fix Dockerfile 'AS' casting (#4170)
Browse files Browse the repository at this point in the history
  • Loading branch information
tamirkamara authored Dec 9, 2024
1 parent 43cab59 commit 0e30b9b
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ENHANCEMENTS:

BUG FIXES:
- Update KeyVault references in API to use the version so Terraform cascades the update ([#4112](https://github.com/microsoft/AzureTRE/pull/4112))
- Fix Dockerfile 'as' casting ([#4170](https://github.com/microsoft/AzureTRE/pull/4170))

COMPONENTS:

Expand Down
10 changes: 5 additions & 5 deletions airlock_processor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# To enable ssh & remote debugging on app service change the base image to the one below
# FROM mcr.microsoft.com/azure-functions/python:4-python3.8-appservice as base
FROM mcr.microsoft.com/azure-functions/python:4-python3.8-slim as base
# FROM mcr.microsoft.com/azure-functions/python:4-python3.8-appservice AS base
FROM mcr.microsoft.com/azure-functions/python:4-python3.8-slim AS base

COPY requirements.txt /
RUN pip install --no-cache-dir -r /requirements.txt


FROM base as test
FROM base AS test
COPY requirements-dev.txt /
RUN pip install --no-cache-dir -r /requirements-dev.txt
WORKDIR /app
COPY . .
RUN /app/run_tests_and_exit_succesfully.sh


FROM scratch as test-results
FROM scratch AS test-results
COPY --from=test /test-results/* /


FROM base as runtime
FROM base AS runtime
ENV AzureWebJobsScriptRoot=/home/site/wwwroot \
AzureFunctionsJobHost__Logging__Console__IsEnabled=true
COPY . /home/site/wwwroot
2 changes: 1 addition & 1 deletion airlock_processor/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.7.2"
__version__ = "0.7.3"
8 changes: 4 additions & 4 deletions api_app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
FROM python:3.8-slim-bullseye as base
FROM python:3.8-slim-bullseye AS base
COPY requirements.txt /.
RUN pip3 install --no-cache-dir -r requirements.txt

FROM base as test
FROM base AS test
COPY requirements-dev.txt /.
RUN pip3 install --no-cache-dir -r requirements-dev.txt
COPY . /api
WORKDIR /api
RUN ./run_tests_and_exit_succesfully.sh


FROM scratch as test-results
FROM scratch AS test-results
COPY --from=test /test-results/* /.


FROM base as runtime
FROM base AS runtime
COPY . /api
WORKDIR /api
RUN groupadd -r api && useradd -r -s /bin/false -g api api_user
Expand Down
2 changes: 1 addition & 1 deletion api_app/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.19.3"
__version__ = "0.19.4"
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ COPY ./guacamole-auth-azure/src /src
COPY ./docker/maven_package_and_exit_succesfully.sh /tmp/
RUN bash /tmp/maven_package_and_exit_succesfully.sh

FROM scratch as test-results
FROM scratch AS test-results
COPY --from=client_build /target/surefire-reports/* /

FROM guacamole/guacd:1.5.5
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.9.0"
__version__ = "0.9.1"
2 changes: 1 addition & 1 deletion templates/workspace_services/guacamole/porter.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
schemaVersion: 1.0.0
name: tre-service-guacamole
version: 0.12.0
version: 0.12.1
description: "An Azure TRE service for Guacamole"
dockerfile: Dockerfile.tmpl
registry: azuretre
Expand Down

0 comments on commit 0e30b9b

Please sign in to comment.