From aecf0f14b77489ead39472ac634e9e9c8b41b632 Mon Sep 17 00:00:00 2001
From: Max Regan <mgregan2@gmail.com>
Date: Sat, 2 May 2020 23:57:38 +0000
Subject: [PATCH] Use Ubuntu 20.04

---
 .gitlab-ci.yml | 28 ++++++++++++++++++++++++++++
 Dockerfile     |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..1d3092d
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/Dockerfile b/Dockerfile
index cd2039d..e779d7b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.10
+FROM ubuntu:20.04
 LABEL maintainer="Max Regan <mgregan2@gmail.com>"
 LABEL description="Container with ARM embedded cross toolchain"