Skip to content

Commit

Permalink
Remove docker from dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
ross-p-smith committed Jun 14, 2023
1 parent b4c02c4 commit c98c22c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
10 changes: 0 additions & 10 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,12 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:bullseye

COPY library-scripts/*.sh /tmp/library-scripts/

# [Option] Enable non-root Docker access in container
ARG ENABLE_NONROOT_DOCKER="true"
# Enable new "BUILDKIT" mode for Docker CLI
ENV DOCKER_BUILDKIT=1

# [Option] Install Docker CLI
ARG INSTALL_DOCKER="true"

ENV NVM_DIR=/usr/local/share/nvm
ENV NVM_SYMLINK_CURRENT=true \
PATH=${NVM_DIR}/current/bin:${PATH}
RUN if [ "${INSTALL_DOCKER}" = "true" ]; then \
bash /tmp/library-scripts/docker-debian.sh "${ENABLE_NONROOT_DOCKER}" "/var/run/docker-host.sock" "/var/run/docker.sock" "${USERNAME}"; \
else \
echo '#!/bin/bash\n"$@"' > /usr/local/share/docker-init.sh && chmod +x /usr/local/share/docker-init.sh; \
fi

# # Install TFLint Azure RM Ruleset
ARG INSTALL_TERRAFORM="true"
Expand Down
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
"ghcr.io/devcontainers/features/go:1": {
"version": "1.17.8"
},
"ghcr.io/devcontainers/features/docker-in-docker:1": {},
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/common-utils:2": {},
Expand Down

0 comments on commit c98c22c

Please sign in to comment.