Skip to content

Commit 1293c9d

Browse files
committed
revert dockerfile changes.
1 parent 1c6a166 commit 1293c9d

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

Dockerfile

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# syntax=docker/dockerfile:1
22

33
ARG GO_VERSION=1.20
4-
ARG DOCKERD_VERSION=20.10.14
54

65
FROM golang:${GO_VERSION}-alpine as build-deployx
76
RUN mkdir /build
@@ -18,7 +17,5 @@ COPY deploy /build/deploy
1817

1918
RUN go build -o docker-deployx cmd/deployx/*
2019

21-
FROM docker:${DOCKERD_VERSION} AS dockerd-release
22-
20+
FROM alpine AS shell
2321
COPY --from=build-deployx /build/docker-deployx /usr/local/bin
24-
RUN mkdir -p /usr/local/lib/docker/cli-plugins && ln -s /usr/local/bin/docker-deployx /usr/local/lib/docker/cli-plugins/docker-deployx

docker-bake.hcl

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,8 @@ variable "GO_VERSION" {
33
default = null
44
}
55

6-
variable "DOCKERD_VERSION" {
7-
# default ARG value set in Dockerfile
8-
default = null
9-
}
10-
116
variable "VERSION_TAG" {
12-
default = "0.0.2"
7+
default = "0.0.1"
138
}
149

1510
variable "DOCKERFILE" {
@@ -25,7 +20,7 @@ target "default" {
2520
GO_VERSION = GO_VERSION
2621
}
2722
pull = true
28-
target = "dockerd-release"
23+
target = "shell"
2924
dockerfile = "${DOCKERFILE}"
3025
output = ["type=image"]
3126

0 commit comments

Comments
 (0)