Skip to content

Commit

Permalink
Clean up Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
sarg3nt committed Oct 28, 2024
1 parent a7eb1b0 commit eb2a6f6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 30 deletions.
12 changes: 0 additions & 12 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,6 @@
"TZ": "America/Los_Angeles" // Set the timezone in the devcontainer
},
"image": "ghcr.io/sarg3nt/go-dev-container:latest",
"build": {
"args": {
"MISE_VERSION": "v2024.10.8",
"GO_DELVE_DLV_VERSION": "1.23.1",
"GO_FUMPT_VERSION": "0.7.0",
"MISE_VERBOSE": "0",
"RUST_BACKTRACE": "0",
"GITHUB_TOKEN": "${localEnv:GITHUB_TOKEN}",
"PROXY_HTTP": "${localEnv:PROXY_HTTP}",
"PROXY_NO": "${localEnv:PROXY_NO}"
}
},
"initializeCommand": [
".devcontainer/initialize_command.sh"
],
Expand Down
20 changes: 2 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,16 @@
# home/vscode/.config/mise/config.toml
# Add custom Mise tools and version to your projects root as .mist.toml See: https://mise.jdx.dev/configuration.html

ARG BASE_IMAGE=rockylinux:9
FROM rockylinux:9

FROM $BASE_IMAGE AS builder

# If you are having issues with the build, set a local env var called GITHUB_TOKEN with a read only github access token.
# The .devcontainer/devcontainer.json file will pass this to the build.
ARG GITHUB_TOKEN
ENV GITHUB_API_TOKEN=${GITHUB_TOKEN}
LABEL org.opencontainers.image.source=https://github.com/sarg3nt/go-dev-container

ENV TZ='America/Los_Angeles'

# What user will be created in the dev container and will we run under.
# Reccomend not changing this.
ENV USERNAME="vscode"

# Set any proxies you may need here.
# The default .devcontainer/devcontainer.json file will pass these to the build if they are set on your host.
ARG PROXY_HTTP=""
ARG PROXY_NO=''
ENV HTTP_PROXY=${PROXY_HTTP}
ENV HTTPS_PROXY=${PROXY_HTTP}
ENV http_proxy=${PROXY_HTTP}
ENV https_proxy=${PROXY_HTTP}
ENV no_proxy=${PROXY_NO}
ENV NO_PROXY=${PROXY_NO}

# Copy script libraries for use by internal scripts
COPY usr/bin/lib /usr/bin/lib

Expand Down

0 comments on commit eb2a6f6

Please sign in to comment.