Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert dev Dockerfile to use official devcontainer image #2335

Merged
merged 3 commits into from
Feb 9, 2024
Merged

Revert dev Dockerfile to use official devcontainer image #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d59583c
Update Dockerfile to use official debian based image for devcontainer
ykadowak Feb 8, 2024
6c00bdd
Use debian as base
ykadowak Feb 9, 2024
dac10af
Update comment
ykadowak Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 36 additions & 0 deletions Makefile.d/tools.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,42 @@ yamlfmt/install: $(GOPATH)/bin/yamlfmt
$(GOPATH)/bin/yamlfmt:
$(call go-install, github.com/google/yamlfmt/cmd/yamlfmt)

.PHONY: gopls/install
gopls/install: $(GOPATH)/bin/gopls

$(GOPATH)/bin/gopls:
$(call go-install, golang.org/x/tools/gopls)

.PHONY: gomodifytags/install
gomodifytags/install: $(GOPATH)/bin/gomodifytags

$(GOPATH)/bin/gomodifytags:
$(call go-install, github.com/fatih/gomodifytags)

.PHONY: impl/install
impl/install: $(GOPATH)/bin/impl

$(GOPATH)/bin/impl:
$(call go-install, github.com/josharian/impl)

.PHONY: goplay/install
goplay/install: $(GOPATH)/bin/goplay

$(GOPATH)/bin/goplay:
$(call go-install, github.com/haya14busa/goplay/cmd/goplay)

.PHONY: delve/install
delve/install: $(GOPATH)/bin/dlv

$(GOPATH)/bin/dlv:
$(call go-install, github.com/go-delve/delve/cmd/dlv)

.PHONY: staticcheck/install
staticcheck/install: $(GOPATH)/bin/staticcheck

$(GOPATH)/bin/staticcheck:
$(call go-install, honnef.co/go/tools/cmd/staticcheck)

.PHONY: rust/install
rust/install: $(CARGO_HOME)/bin/cargo

Expand Down
13 changes: 10 additions & 3 deletions dockers/dev/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
ARG MAINTAINER="vdaas.org vald team <vald@vdaas.org>"

# skipcq: DOK-DL3026
FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder
# we should stick to official devcontainers as a base image because it is well tested to be used with the vscode devcontainer extension.
FROM --platform=${BUILDPLATFORM} mcr.microsoft.com/vscode/devcontainers/base:debian
LABEL maintainer="${MAINTAINER}"

ARG GO_VERSION
Expand Down Expand Up @@ -71,7 +72,6 @@ COPY rust rust
COPY hack/go.mod.default hack/go.mod.default
COPY example/client/go.mod.default example/client/go.mod.default

# basic deps
RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \
--mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \
make GOARCH=${TARGETARCH} GOOS=${TARGETOS} deps GO_CLEAN_DEPS=false \
Expand All @@ -89,4 +89,11 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \
&& make k9s/install \
&& make minikube/install \
&& make stern/install \
&& make telepresence/install
&& make telepresence/install \
&& echo "installing golang vscode extension dependencies" \
&& make gopls/install \
&& make gotests/install \
&& make gomodifytags/install \
&& make impl/install \
&& make delve/install \
&& make staticcheck/install