Merge pull request #17 from theohbrothers/feature/add-bash-completion…

…-gnupg-and-openssl-in-base-variants Feature: Add `bash-completion`, `gnupg`, and `openssl` in base variants
theohbrothers · Dec 27, 2022 · 7a3d0b7 · 7a3d0b7
2 parents 7acdeef + d0f3149
commit 7a3d0b7
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ Incremental variants contain additional tools. E.g. `v4.9.1-docker-alpine-3.15`:
 To run a base variant:
 
 ```sh
-docker run --name code-server --rm -it -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:latest
+docker run --name code-server --rm -it -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:v4.9.1-alpine-3.15
 ```
 
 To run an incremental variant:
@@ -50,7 +50,7 @@ To run an incremental variant:
 docker run --name code-server --rm -it --privileged -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:v4.9.1-docker-alpine-3.15
 
 # pwsh
-docker run --name code-server --rm -it --privileged -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:
+docker run --name code-server --rm -it --privileged -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:v4.8.3-pwsh-7.3.1-alpine-3.15
 ```
 
 `code-server` is now available at http://127.0.0.1:8080. To login, use the password in the config file:

diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -20,7 +20,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && code-server --version \
     && apk del `$DEPS
 
-RUN apk add --no-cache bash ca-certificates curl git git-lfs jq nano openssh-client tree
+RUN apk add --no-cache bash bash-completion ca-certificates curl gnupg git git-lfs jq nano openssh-client openssl tree
 
 RUN apk add --no-cache sudo
 RUN adduser -u 1000 --gecos '' -D user
@@ -96,7 +96,6 @@ USER root
 # Install rootless docker
 # See: https://docs.docker.com/engine/security/rootless/
 RUN apk add --no-cache shadow-uidmap fuse-overlayfs iproute2 iptables ip6tables
-RUN apk add --no-cache bash-completion
 RUN echo user:100000:65536 >/etc/subuid
 RUN echo user:100000:65536 >/etc/subgid
 USER user

diff --git a/generate/templates/README.md.ps1 b/generate/templates/README.md.ps1
@@ -42,7 +42,7 @@ Incremental variants contain additional tools. E.g. ``$( $VARIANTS | ? { $_['_me
 To run a base variant:
 
 ``````sh
-docker run --name code-server --rm -it -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:latest
+docker run --name code-server --rm -it -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:$( $VARIANTS | ? { $_['tag_as_latest'] } | Select-Object -ExpandProperty tag )
 ``````
 
 To run an incremental variant:
@@ -52,7 +52,7 @@ To run an incremental variant:
 docker run --name code-server --rm -it --privileged -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:$( $VARIANTS | ? { $_['_metadata']['components'] -contains 'docker' } | Select-Object -First 1 | Select-Object -ExpandProperty tag )
 
 # pwsh
-docker run --name code-server --rm -it --privileged -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:$( $VARIANTS | ? { $_['_metadata']['components'] -contains 'pwsh' } | Select-Object -First 1 | Select-Object -ExpandProperty tag )
+docker run --name code-server --rm -it --privileged -p 127.0.0.1:8080:8080 theohbrothers/docker-code-server:$( $VARIANTS | ? { $_['_metadata']['components'] -match 'pwsh' } | Select-Object -First 1 | Select-Object -ExpandProperty tag )
 ``````
 
 ``code-server`` is now available at http://127.0.0.1:8080. To login, use the password in the config file:

diff --git a/variants/v4.6.1-alpine-3.15/Dockerfile b/variants/v4.6.1-alpine-3.15/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && code-server --version \
     && apk del $DEPS
 
-RUN apk add --no-cache bash ca-certificates curl git git-lfs jq nano openssh-client tree
+RUN apk add --no-cache bash bash-completion ca-certificates curl gnupg git git-lfs jq nano openssh-client openssl tree
 
 RUN apk add --no-cache sudo
 RUN adduser -u 1000 --gecos '' -D user

diff --git a/variants/v4.6.1-docker-rootless-alpine-3.15/Dockerfile b/variants/v4.6.1-docker-rootless-alpine-3.15/Dockerfile
@@ -6,7 +6,6 @@ USER root
 # Install rootless docker
 # See: https://docs.docker.com/engine/security/rootless/
 RUN apk add --no-cache shadow-uidmap fuse-overlayfs iproute2 iptables ip6tables
-RUN apk add --no-cache bash-completion
 RUN echo user:100000:65536 >/etc/subuid
 RUN echo user:100000:65536 >/etc/subgid
 USER user

diff --git a/variants/v4.7.1-alpine-3.15/Dockerfile b/variants/v4.7.1-alpine-3.15/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && code-server --version \
     && apk del $DEPS
 
-RUN apk add --no-cache bash ca-certificates curl git git-lfs jq nano openssh-client tree
+RUN apk add --no-cache bash bash-completion ca-certificates curl gnupg git git-lfs jq nano openssh-client openssl tree
 
 RUN apk add --no-cache sudo
 RUN adduser -u 1000 --gecos '' -D user

diff --git a/variants/v4.7.1-docker-rootless-alpine-3.15/Dockerfile b/variants/v4.7.1-docker-rootless-alpine-3.15/Dockerfile
@@ -6,7 +6,6 @@ USER root
 # Install rootless docker
 # See: https://docs.docker.com/engine/security/rootless/
 RUN apk add --no-cache shadow-uidmap fuse-overlayfs iproute2 iptables ip6tables
-RUN apk add --no-cache bash-completion
 RUN echo user:100000:65536 >/etc/subuid
 RUN echo user:100000:65536 >/etc/subgid
 USER user

diff --git a/variants/v4.8.3-alpine-3.15/Dockerfile b/variants/v4.8.3-alpine-3.15/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && code-server --version \
     && apk del $DEPS
 
-RUN apk add --no-cache bash ca-certificates curl git git-lfs jq nano openssh-client tree
+RUN apk add --no-cache bash bash-completion ca-certificates curl gnupg git git-lfs jq nano openssh-client openssl tree
 
 RUN apk add --no-cache sudo
 RUN adduser -u 1000 --gecos '' -D user

diff --git a/variants/v4.8.3-docker-rootless-alpine-3.15/Dockerfile b/variants/v4.8.3-docker-rootless-alpine-3.15/Dockerfile
@@ -6,7 +6,6 @@ USER root
 # Install rootless docker
 # See: https://docs.docker.com/engine/security/rootless/
 RUN apk add --no-cache shadow-uidmap fuse-overlayfs iproute2 iptables ip6tables
-RUN apk add --no-cache bash-completion
 RUN echo user:100000:65536 >/etc/subuid
 RUN echo user:100000:65536 >/etc/subgid
 USER user

diff --git a/variants/v4.9.1-alpine-3.15/Dockerfile b/variants/v4.9.1-alpine-3.15/Dockerfile
@@ -17,7 +17,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN \
     && code-server --version \
     && apk del $DEPS
 
-RUN apk add --no-cache bash ca-certificates curl git git-lfs jq nano openssh-client tree
+RUN apk add --no-cache bash bash-completion ca-certificates curl gnupg git git-lfs jq nano openssh-client openssl tree
 
 RUN apk add --no-cache sudo
 RUN adduser -u 1000 --gecos '' -D user

diff --git a/variants/v4.9.1-docker-rootless-alpine-3.15/Dockerfile b/variants/v4.9.1-docker-rootless-alpine-3.15/Dockerfile
@@ -6,7 +6,6 @@ USER root
 # Install rootless docker
 # See: https://docs.docker.com/engine/security/rootless/
 RUN apk add --no-cache shadow-uidmap fuse-overlayfs iproute2 iptables ip6tables
-RUN apk add --no-cache bash-completion
 RUN echo user:100000:65536 >/etc/subuid
 RUN echo user:100000:65536 >/etc/subgid
 USER user