Skip to content

Commit 8f8600a

Browse files
committed
updating variable syntax and pinning botocore version
1 parent 6e4c9b3 commit 8f8600a

File tree

3 files changed

+120
-135
lines changed

3 files changed

+120
-135
lines changed

Diff for: Dockerfile

+6-8
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ ARG AZLINUX_BASE_VERSION=master
22

33
FROM quay.io/cdis/python-nginx-al:${AZLINUX_BASE_VERSION} AS base
44

5-
# FROM 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/python-nginx-al2:feat_python-nginx AS base
6-
75
ENV appname=peregrine
86

97
WORKDIR /${appname}
108

11-
RUN chown -R gen3:gen3 /$appname
9+
RUN chown -R gen3:gen3 /${appname}
1210

1311
# Builder stage
1412
FROM base AS builder
@@ -19,22 +17,22 @@ COPY poetry.lock pyproject.toml /${appname}/
1917

2018
RUN poetry install -vv --only main --no-interaction
2119

22-
COPY --chown=gen3:gen3 . /$appname
20+
COPY --chown=gen3:gen3 . /${appname}
2321

2422
# Run poetry again so this app itself gets installed too
2523
RUN poetry install --without dev --no-interaction
2624

27-
RUN git config --global --add safe.directory /${appname} && COMMIT=`git rev-parse HEAD` && echo "COMMIT=\"${COMMIT}\"" > /$appname/version_data.py \
28-
&& VERSION=`git describe --always --tags` && echo "VERSION=\"${VERSION}\"" >> /$appname/version_data.py
25+
RUN git config --global --add safe.directory /${appname} && COMMIT=`git rev-parse HEAD` && echo "COMMIT=\"${COMMIT}\"" > /${appname}/version_data.py \
26+
&& VERSION=`git describe --always --tags` && echo "VERSION=\"${VERSION}\"" >> /${appname}/version_data.py
2927

3028
# Final stage
3129
FROM base
3230

33-
COPY --from=builder /$appname /$appname
31+
COPY --from=builder /${appname} /${appname}
3432

3533
# Switch to non-root user 'gen3' for the serving process
3634
USER gen3
3735

38-
WORKDIR /$appname
36+
WORKDIR /${appname}
3937

4038
CMD ["/bin/bash", "-c", "/${appname}/dockerrun.bash"]

0 commit comments

Comments
 (0)