Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/Dockerfile.package-rocky
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN dnf install -y python3 python3-devel python3-jinja2 python3-pip python3-setu
ncurses-compat-libs glib2 libXext libXrender-devel pixman lsb_release

# Setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV LC_ALL=en_US.utf-8

Expand All @@ -21,5 +21,5 @@ RUN useradd -m -U -u $USER_ID slash
USER slash

# Again, setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
ENV LC_ALL=en_US.utf-8
4 changes: 2 additions & 2 deletions scripts/Dockerfile.package-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN . /etc/os-release && \
fi

# Setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV LC_ALL=en_US.utf-8

Expand All @@ -44,5 +44,5 @@ RUN if id -u $USER_ID >/dev/null 2>&1; then \
USER slash

# Again, setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
ENV LC_ALL=en_US.utf-8
5 changes: 2 additions & 3 deletions scripts/Dockerfile.run-rocky
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COPY rpm/*.rpm /tmp
RUN dnf install -y /tmp/*.rpm

# Setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV LC_ALL=en_US.utf-8

Expand All @@ -22,6 +22,5 @@ RUN useradd -m -U -u $USER_ID slash
USER slash

# Again, setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
ENV LC_ALL=en_US.utf-8

4 changes: 2 additions & 2 deletions scripts/Dockerfile.run-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN apt install -y /tmp/slash-dev_*.deb \
/tmp/libvrt_*.deb

# Setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ENV LC_ALL=en_US.utf-8

Expand All @@ -49,5 +49,5 @@ RUN if id -u $USER_ID >/dev/null 2>&1; then \
USER slash

# Again, setting timezone and locale for Vivado
ENV TZ="Europe/Dublin"
ARG TZ="Europe/Dublin"
ENV LC_ALL=en_US.utf-8
1 change: 1 addition & 0 deletions scripts/run-with-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ IMAGE_TAG="slash-$CONTAINER-$DISTRO:$VERSION"
docker build \
--build-arg USER_ID=$(id -u) \
--build-arg BASE_IMAGE="$BASE_IMAGE" \
--build-arg TZ=$(timedatectl show -p Timezone --value) \
-t "$IMAGE_TAG" \
-f "scripts/Dockerfile.$CONTAINER-$DISTRO" .
docker run $DOCKER_RUN_ARGS \
Expand Down