Skip to content

Commit

Permalink
Merge pull request #137 from marcransome/dev-container-image-arg
Browse files Browse the repository at this point in the history
Add image version arg for dev container and motd
  • Loading branch information
marcransome authored May 29, 2023
2 parents 7de0244 + 702d37d commit 313cec4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM rockylinux:9.2-minimal
ARG BASE_IMAGE_VERSION=9.2-minimal
FROM rockylinux:${BASE_IMAGE_VERSION}

ENV TIMEZONE=Europe/London
RUN ln -snf /usr/share/zoneinfo/$TIMEZONE /etc/localtime && \
Expand All @@ -15,7 +16,10 @@ RUN rm -rf /usr/share/doc

RUN /usr/bin/fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source; and fisher install jorgebucaran/{fisher,fishtape}"

ARG BASE_IMAGE_VERSION
COPY motd /etc/motd
RUN sed -i "s/{{BASE_IMAGE_VERSION}}/$BASE_IMAGE_VERSION/" /etc/motd

COPY fish_greeting.fish /root/.config/fish/functions

ENTRYPOINT ["/usr/bin/fish"]
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/motd
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

β–‘β–„β–€β–€β–„β–‘β–„β–€β–€β–„β–‘β–ˆβ–€β–€β–„β–‘β–ˆβ–€β–„
β–‘β–ˆβ–„β–„β–ˆβ–‘β–ˆβ–‘β–‘β–ˆβ–‘β–ˆβ–‘β–’β–ˆβ–‘β–ˆβ–‘β–ˆ  dev container
β–‘β–ˆβ–‘β–‘β–‘β–‘β–‘β–€β–€β–‘β–‘β–€β–‘β–‘β–€β–‘β–€β–€β–‘ rockylinux:9.1-minimal
β–‘β–ˆβ–‘β–‘β–‘β–‘β–‘β–€β–€β–‘β–‘β–€β–‘β–‘β–€β–‘β–€β–€β–‘ rockylinux:{{BASE_IMAGE_VERSION}}

- See CONTRIBUTING.md and CODE_OF_CONDUCT.md before contributing changes
to the project
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ The project sources will be mounted at `/workspaces/pond`, and the container wil
```
β–‘β–„β–€β–€β–„β–‘β–„β–€β–€β–„β–‘β–ˆβ–€β–€β–„β–‘β–ˆβ–€β–„
β–‘β–ˆβ–„β–„β–ˆβ–‘β–ˆβ–‘β–‘β–ˆβ–‘β–ˆβ–‘β–’β–ˆβ–‘β–ˆβ–‘β–ˆ dev container
β–‘β–ˆβ–‘β–‘β–‘β–‘β–‘β–€β–€β–‘β–‘β–€β–‘β–‘β–€β–‘β–€β–€β–‘ rockylinux:9.0-minimal
β–‘β–ˆβ–‘β–‘β–‘β–‘β–‘β–€β–€β–‘β–‘β–€β–‘β–‘β–€β–‘β–€β–€β–‘ rockylinux:9.2-minimal
- See CONTRIBUTING.md and CODE_OF_CONDUCT.md before contributing changes
to the project
Expand Down

0 comments on commit 313cec4

Please sign in to comment.