Compare commits
5 commits
ac8230e2df
...
c13a89807e
Author | SHA1 | Date | |
---|---|---|---|
Glenn Y. Rolland | c13a89807e | ||
Glenn Y. Rolland | 0348a4ec86 | ||
Glenn Y. Rolland | 873f63533b | ||
Glenn Y. Rolland | b98c50246f | ||
Glenn Y. Rolland | a53a103a1d |
|
@ -35,13 +35,12 @@ build:docker-image:
|
||||||
needs:
|
needs:
|
||||||
- build:executable
|
- build:executable
|
||||||
script:
|
script:
|
||||||
|
- apk install make
|
||||||
- make docker-build
|
- make docker-build
|
||||||
|
- make docker-save > _artifacts/docker-image.tar
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- bin
|
- _artifacts
|
||||||
cache:
|
|
||||||
paths:
|
|
||||||
- lib
|
|
||||||
|
|
||||||
sast:
|
sast:
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -50,7 +49,12 @@ publish:docker-image:
|
||||||
stage: publish
|
stage: publish
|
||||||
needs:
|
needs:
|
||||||
- build:docker-image
|
- build:docker-image
|
||||||
|
image: docker:20.10.16
|
||||||
|
services:
|
||||||
|
- docker:20.10.16-dind
|
||||||
script:
|
script:
|
||||||
|
- apk install make
|
||||||
|
- make docker-load < _artifacts/docker-image.tar
|
||||||
- make docker-push
|
- make docker-push
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
|
|
14
Makefile
14
Makefile
|
@ -1,4 +1,6 @@
|
||||||
|
|
||||||
|
DOCKER_IMAGE=glenux/openstack
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
@ -8,10 +10,16 @@ build:
|
||||||
docker: docker-build docker-test docker-push
|
docker: docker-build docker-test docker-push
|
||||||
|
|
||||||
docker-build:
|
docker-build:
|
||||||
docker build --file docker/Dockerfile -t glenux/openstack-arkisto .
|
docker build --file docker/Dockerfile -t $(DOCKER_IMAGE) .
|
||||||
|
|
||||||
docker-push:
|
docker-push:
|
||||||
docker push glenux/openstack-arkisto
|
docker push $(DOCKER_IMAGE)
|
||||||
|
|
||||||
docker-test:
|
docker-test:
|
||||||
docker run glenux/openstack-arkisto arkisto --version
|
docker run $(DOCKER_IMAGE) arkisto --version
|
||||||
|
|
||||||
|
docker-save:
|
||||||
|
docker save $(DOCKER_IMAGE)
|
||||||
|
|
||||||
|
docker-load:
|
||||||
|
docker load $(DOCKER_IMAGE)
|
||||||
|
|
Loading…
Reference in a new issue