Skip to content

Commit

Permalink
Backport PR scikit-hep#2543: chore: Apply Docker build check corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewfeickert authored and meeseeksmachine committed Sep 19, 2024
1 parent a7dcfa4 commit 317ebb5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ARG BASE_IMAGE=python:3.12-slim-bullseye
# hadolint ignore=DL3006
FROM ${BASE_IMAGE} as base
FROM ${BASE_IMAGE} AS base

FROM base as builder
FROM base AS builder
# Set PATH to pickup virtual environment by default
ENV PATH=/usr/local/venv/bin:"${PATH}"
COPY . /code
Expand Down Expand Up @@ -49,10 +49,11 @@ RUN adduser \

COPY --from=builder --chown=moby /usr/local/venv /usr/local/venv/

# Does NOT define USER as ENV
USER moby

ENV USER ${USER}
ENV HOME /home/moby
ENV USER=moby
ENV HOME=/home/moby
WORKDIR ${HOME}/work

# Use C.UTF-8 locale to avoid issues with ASCII encoding
Expand Down
4 changes: 2 additions & 2 deletions docker/gpu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 as base
FROM nvidia/cuda:10.1-cudnn7-runtime-ubuntu18.04 AS base

FROM base as builder
FROM base AS builder
# hadolint ignore=DL3015
RUN apt-get update -y && \
apt-get install -y \
Expand Down

0 comments on commit 317ebb5

Please sign in to comment.