Merge branch 'ubuntu-20.04' into 'master'
Use Ubuntu 20.04 See merge request max/arm-build-image!1
This commit is contained in:
28
.gitlab-ci.yml
Normal file
28
.gitlab-ci.yml
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
# This file is a template, and might need editing before it works on your project.
|
||||||
|
docker-build-master:
|
||||||
|
# Official docker image.
|
||||||
|
image: docker:latest
|
||||||
|
stage: build
|
||||||
|
services:
|
||||||
|
- docker:dind
|
||||||
|
before_script:
|
||||||
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
|
script:
|
||||||
|
- docker build --pull -t "$CI_REGISTRY_IMAGE" .
|
||||||
|
- docker push "$CI_REGISTRY_IMAGE"
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
|
||||||
|
docker-build:
|
||||||
|
# Official docker image.
|
||||||
|
image: docker:latest
|
||||||
|
stage: build
|
||||||
|
services:
|
||||||
|
- docker:dind
|
||||||
|
before_script:
|
||||||
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
|
script:
|
||||||
|
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
|
||||||
|
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
|
||||||
|
except:
|
||||||
|
- master
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM ubuntu:18.10
|
FROM ubuntu:20.04
|
||||||
LABEL maintainer="Max Regan <mgregan2@gmail.com>"
|
LABEL maintainer="Max Regan <mgregan2@gmail.com>"
|
||||||
LABEL description="Container with ARM embedded cross toolchain"
|
LABEL description="Container with ARM embedded cross toolchain"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user