Skip to content

Commit

Permalink
Add wheel package to all containers
Browse files Browse the repository at this point in the history
  • Loading branch information
asmorodskyi committed Aug 11, 2023
1 parent 4d0dc1f commit fc832de
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .hadolint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ failure-threshold: warning
format: tty

# Ignored rules:
# DL3013 - Specify package version because we don't want to do that
# DL3037 - Specify package version because we don't want to do that
# DL4006 - Use SHELL option `-o pipefail` because that's non OCI container option
ignored: [DL3037, DL4006]
ignored: [DL3013, DL3037, DL4006]
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY requirements.txt /pcw/
# * Install system requirements
# * Install pip requirements
# * Empty system cache to conserve some space
RUN zypper -n in gcc libffi-devel && pip install --no-cache-dir -r /pcw/requirements.txt && zypper clean && rm -rf /var/cache
RUN zypper -n in gcc libffi-devel && pip install --no-cache-dir wheel && pip install --no-cache-dir -r /pcw/requirements.txt && zypper clean && rm -rf /var/cache

# Copy program files only
COPY ocw /pcw/ocw/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV UWSGI_HTTP_AUTO_CHUNKED=1 UWSGI_HTTP_KEEPALIVE=1 UWSGI_LAZY_APPS=1 UWSGI_WSG
RUN zypper -n in gcc libffi-devel && zypper clean && rm -rf /var/cache

COPY requirements.txt requirements_test.txt requirements_k8s.txt /tmp/
RUN pip install --no-cache-dir -r /tmp/requirements_test.txt
RUN pip install --no-cache-dir wheel && pip install --no-cache-dir -r /tmp/requirements_test.txt

WORKDIR /pcw

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_k8s
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN curl -sf https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-c

# Install python dependences
COPY requirements_k8s.txt /pcw/
RUN pip3.11 install --no-cache-dir -r /pcw/requirements_k8s.txt
RUN pip install --no-cache-dir wheel && pip install --no-cache-dir -r /pcw/requirements_k8s.txt

# Copy program files only
COPY ocw /pcw/ocw/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile_k8s_dev
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN curl -s https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cl

# Install python dependences
COPY requirements_k8s.txt requirements.txt requirements_test.txt /pcw/
RUN pip3.11 install --no-cache-dir -r /pcw/requirements_k8s.txt
RUN pip install --no-cache-dir wheel && pip install --no-cache-dir -r /pcw/requirements_k8s.txt

ENV PATH ${PATH}:/opt/google-cloud-sdk/bin/

Expand Down

0 comments on commit fc832de

Please sign in to comment.