use ubuntu:focal as base image

This commit is contained in:
yrzr 2021-01-11 21:45:36 +08:00
parent b04cdbe4bd
commit 79642537ca

View File

@ -42,8 +42,8 @@ build:
- cd ./omnibus-gitlab/docker - cd ./omnibus-gitlab/docker
# write RELEASE # write RELEASE
- echo "PACKAGECLOUD_REPO=gitlab-ce" > RELEASE && echo "RELEASE_PACKAGE=gitlab-ce" >> RELEASE && echo "RELEASE_VERSION=${CI_COMMIT_TAG}" >> RELEASE && echo "DOWNLOAD_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/focal/gitlab-ce_${CI_COMMIT_TAG}_arm64.deb/download.deb" >> RELEASE - echo "PACKAGECLOUD_REPO=gitlab-ce" > RELEASE && echo "RELEASE_PACKAGE=gitlab-ce" >> RELEASE && echo "RELEASE_VERSION=${CI_COMMIT_TAG}" >> RELEASE && echo "DOWNLOAD_URL=https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/focal/gitlab-ce_${CI_COMMIT_TAG}_arm64.deb/download.deb" >> RELEASE
# debian:buster as base image # ubuntu:focal as base image
- sed -i 's/^FROM ubuntu.*/FROM debian\:buster/' Dockerfile - sed -i 's/^FROM ubuntu.*/FROM ubuntu\:focal/' Dockerfile
# missing package libatomic1 after version 13 # missing package libatomic1 after version 13
- sed -i 's/less/less libatomic1/' Dockerfile - sed -i 's/less/less libatomic1/' Dockerfile
# debian has /etc/os-release instead of /etc/lsb-release # debian has /etc/os-release instead of /etc/lsb-release