Skip to content

Commit 8596126

Browse files
committed
Add management of docker manifest + base manisfest on gitea
1 parent c8c5bab commit 8596126

File tree

8 files changed

+43
-29
lines changed

8 files changed

+43
-29
lines changed

Makefile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ build: $(EXECUTABLE)
123123

124124
$(EXECUTABLE): $(SOURCES)
125125
go build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
126-
126+
127127
.PHONY: docker-build
128128
docker-build:
129129
docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" webhippie/golang:edge make clean generate build
@@ -153,6 +153,20 @@ docker-multi-arm64: DOCKER_BASE=multiarch/alpine:aarch64-latest-stable
153153
docker-multi-arm64: DOCKER_TAG=linux-arm64-latest
154154
docker-multi-arm64: docker-multi-build
155155

156+
.PHONY: docker-multi-push
157+
docker-multi-push: DOCKER_PUSHIMAGE ?= "gitea/gitea"
158+
docker-multi-push:
159+
docker tag gitea/gitea:$(DOCKER_TAG) $(DOCKER_PUSHIMAGE):$(DOCKER_TAG)
160+
docker push $(DOCKER_PUSHIMAGE):$(DOCKER_TAG)
161+
162+
.PHONY: docker-multi-update-manifest
163+
docker-multi-update-manifest: DOCKER_MANIFEST ?= "docker/manifest/gitea.yml"
164+
docker-multi-update-manifest:
165+
@hash manifest-tool > /dev/null 2>&1; if [ $$? -ne 0 ]; then \
166+
go get -u github.com/estesp/manifest-tool; \
167+
fi
168+
@manifest-tool --username $(DOCKER_USERNAME) --password $(DOCKER_PASSWORD) push from-spec $(DOCKER_MANIFEST)
169+
156170
.PHONY: docker
157171
docker:
158172
docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="bindata $(TAGS)" webhippie/golang:edge make clean generate build

docker/manifest/gitea-1-0-0.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
image: sapk/gitea:1.0.0
1+
image: gitea/gitea:1.0.0
22
manifests:
3-
- image: sapk/gitea:linux-amd64-1.0.0
3+
- image: gitea/gitea:linux-amd64-1.0.0
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: sapk/gitea:linux-arm-1.0.0
7+
- image: gitea/gitea:linux-arm-1.0.0
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: sapk/gitea:linux-arm64-1.0.0
11+
- image: gitea/gitea:linux-arm64-1.0.0
1212
platform:
1313
architecture: arm64
1414
os: linux

docker/manifest/gitea-1-0-1.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
image: sapk/gitea:1.0.1
1+
image: gitea/gitea:1.0.1
22
manifests:
3-
- image: sapk/gitea:linux-amd64-1.0.1
3+
- image: gitea/gitea:linux-amd64-1.0.1
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: sapk/gitea:linux-arm-1.0.1
7+
- image: gitea/gitea:linux-arm-1.0.1
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: sapk/gitea:linux-arm64-1.0.1
11+
- image: gitea/gitea:linux-arm64-1.0.1
1212
platform:
1313
architecture: arm64
1414
os: linux

docker/manifest/gitea-1-0-2.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
image: sapk/gitea:1.0.2
1+
image: gitea/gitea:1.0.2
22
manifests:
3-
- image: sapk/gitea:linux-amd64-1.0.2
3+
- image: gitea/gitea:linux-amd64-1.0.2
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: sapk/gitea:linux-arm-1.0.2
7+
- image: gitea/gitea:linux-arm-1.0.2
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: sapk/gitea:linux-arm64-1.0.2
11+
- image: gitea/gitea:linux-arm64-1.0.2
1212
platform:
1313
architecture: arm64
1414
os: linux

docker/manifest/gitea-1-0.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
image: sapk/gitea:1.0
1+
image: gitea/gitea:1.0
22
manifests:
3-
- image: sapk/gitea:linux-amd64-1.0
3+
- image: gitea/gitea:linux-amd64-1.0
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: sapk/gitea:linux-arm-1.0
7+
- image: gitea/gitea:linux-arm-1.0
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: sapk/gitea:linux-arm64-1.0
11+
- image: gitea/gitea:linux-arm64-1.0
1212
platform:
1313
architecture: arm64
1414
os: linux

docker/manifest/gitea-1-1-0.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
image: sapk/gitea:1.1.0
1+
image: gitea/gitea:1.1.0
22
manifests:
3-
- image: sapk/gitea:linux-amd64-1.1.0
3+
- image: gitea/gitea:linux-amd64-1.1.0
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: sapk/gitea:linux-arm-1.1.0
7+
- image: gitea/gitea:linux-arm-1.1.0
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: sapk/gitea:linux-arm64-1.1.0
11+
- image: gitea/gitea:linux-arm64-1.1.0
1212
platform:
1313
architecture: arm64
1414
os: linux

docker/manifest/gitea-1-1.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
image: sapk/gitea:1.1
1+
image: gitea/gitea:1.1
22
manifests:
3-
- image: sapk/gitea:linux-amd64-1.1
3+
- image: gitea/gitea:linux-amd64-1.1
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: sapk/gitea:linux-arm-1.1
7+
- image: gitea/gitea:linux-arm-1.1
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: sapk/gitea:linux-arm64-1.1
11+
- image: gitea/gitea:linux-arm64-1.1
1212
platform:
1313
architecture: arm64
1414
os: linux

docker/manifest/gitea.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
image: sapk/gitea:latest
1+
image: gitea/gitea:latest
22
manifests:
3-
- image: sapk/gitea:linux-amd64-latest
3+
- image: gitea/gitea:linux-amd64-latest
44
platform:
55
architecture: amd64
66
os: linux
7-
- image: sapk/gitea:linux-arm-latest
7+
- image: gitea/gitea:linux-arm-latest
88
platform:
99
architecture: arm
1010
os: linux
11-
- image: sapk/gitea:linux-arm64-latest
11+
- image: gitea/gitea:linux-arm64-latest
1212
platform:
1313
architecture: arm64
1414
os: linux

0 commit comments

Comments
 (0)