Kelly Norton 10 mesiacov pred
rodič
commit
90bacdc9d7
2 zmenil súbory, kde vykonal 3 pridanie a 8 odobranie
  1. 1 3
      Dockerfile
  2. 2 5
      Makefile

+ 1 - 3
Dockerfile

@@ -1,9 +1,7 @@
 FROM kellegous/build:f1799259 AS build
 FROM kellegous/build:f1799259 AS build
 
 
-ARG SHA
-
 COPY . /src
 COPY . /src
-RUN cd /src && CGO_ENABLED=0 make SHA=${SHA} clean all
+RUN cd /src && CGO_ENABLED=0 make clean all
 
 
 FROM scratch
 FROM scratch
 
 

+ 2 - 5
Makefile

@@ -1,12 +1,10 @@
-ifndef SHA
-	SHA := $(shell git rev-parse HEAD)
-endif
+SHA := $(shell git rev-parse HEAD)
 
 
 ASSETS := \
 ASSETS := \
 	internal/ui/assets/edit/index.html \
 	internal/ui/assets/edit/index.html \
 	internal/ui/assets/index.html
 	internal/ui/assets/index.html
 
 
-.PHONY: all clean develop
+.PHONY: all clean develop publish
 
 
 all: bin/go
 all: bin/go
 
 
@@ -44,5 +42,4 @@ publish: bin/publish
 		--tag=$(shell git rev-parse --short $(SHA)) \
 		--tag=$(shell git rev-parse --short $(SHA)) \
 		--platform=linux/arm64 \
 		--platform=linux/arm64 \
 		--platform=linux/amd64 \
 		--platform=linux/amd64 \
-		--build-arg=SHA=${SHA} \
 		--image=kellegous/go
 		--image=kellegous/go