use Dockerfile

matifali · matifali · commit 500d4a188cfe · 2023-06-19T13:27:55.000+03:00
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,7 +1,13 @@
 {
   "name": "Development environments on your infrastructure",
-  "image": "codercom/oss-dogfood:latest",
+  "context": "../dogfood",
+  "dockerFile": "../dogfood/Dockerfile",
   "runArgs": ["--init", "--privileged"],
   "overrideCommand": false,
-  "remoteUser": "coder"
+  "features": {
+    "ghcr.io/devcontainers/features/docker-in-docker:1": {
+      "version": "latest",
+      "moby": true
+    }
+  }
 }
diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
@@ -165,15 +165,9 @@ RUN apt-get update --quiet && apt-get install --yes \
 	# Configure FIPS-compliant policies
 	update-crypto-policies --set FIPS
 
-# Install the docker buildx component.
-RUN DOCKER_BUILDX_VERSION=$(curl -s "https://api.github.com/repos/docker/buildx/releases/latest" | grep '"tag_name":' |  sed -E 's/.*"(v[^"]+)".*/\1/') && \
-	mkdir -p /usr/local/lib/docker/cli-plugins && \
-	curl -Lo /usr/local/lib/docker/cli-plugins/docker-buildx "https://github.com/docker/buildx/releases/download/${DOCKER_BUILDX_VERSION}/buildx-${DOCKER_BUILDX_VERSION}.linux-amd64" && \
-	chmod a+x /usr/local/lib/docker/cli-plugins/docker-buildx
-
 # See https://github.com/cli/cli/issues/6175#issuecomment-1235984381 for proof
 # the apt repository is unreliable
-RUN curl -L https://github.com/cli/cli/releases/download/v2.14.7/gh_2.14.7_linux_amd64.deb -o gh.deb && \
+RUN curl -L https://github.com/cli/cli/releases/download/v2.30.0/gh_2.30.0_linux_amd64.deb -o gh.deb && \
 	dpkg -i gh.deb
 
 # Install Lazygit
@@ -207,9 +201,7 @@ RUN systemctl disable \
 	postgresql
 
 # Configure systemd services for CVMs
-RUN systemctl enable \
-	docker \
-	ssh
+RUN systemctl enable ssh
 
 # Install tools with published releases, where that is the
 # preferred/recommended installation method.
