Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

.gitlab-ci.yml: minor changes inside the .yml file.

Browse source 
+ ubuntu:21.10 added into the pipeline,
- ubuntu:20.10 removed from the pipeline,

+ misc/docker/ubuntu-21.10-amd64/Dockerfile added,
- misc/docker/ubuntu-20.10-amd64/Dockerfile removed.
This commit is contained in:
Matous Holinka 2022-01-06 09:53:23 +01:00 committed by Ondrej Zajicek (work)
parent 81ee6cda2e
commit a9646efd40
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci.yml
View file

@ -164,9 +164,9 @@ docker_ubuntu-20_04-amd64:
IMG_NAME: "ubuntu-20.04-amd64" IMG_NAME: "ubuntu-20.04-amd64"
<<: *docker_build <<: *docker_build
docker_ubuntu-20_10-amd64: docker_ubuntu-21_10-amd64:
variables: variables:
IMG_NAME: "ubuntu-20.10-amd64" IMG_NAME: "ubuntu-21.10-amd64"
<<: *docker_build <<: *docker_build
# GPG error # GPG error
@ -336,9 +336,9 @@ build-ubuntu-20_04-amd64:
<<: *build-linux <<: *build-linux
image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64
build-ubuntu-20_10-amd64: build-ubuntu-21_10-amd64:
<<: *build-linux <<: *build-linux
image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64 image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64
#build-ubuntu-21_04-amd64: #build-ubuntu-21_04-amd64:
# <<: *build-linux # <<: *build-linux
@ -490,10 +490,11 @@ pkg-ubuntu-20.04-amd64:
needs: [build-ubuntu-20_04-amd64] needs: [build-ubuntu-20_04-amd64]
image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64 image: registry.nic.cz/labs/bird:ubuntu-20.04-amd64
pkg-ubuntu-20.10-amd64:
pkg-ubuntu-21.10-amd64:
<<: *pkg-deb <<: *pkg-deb
needs: [build-ubuntu-20_10-amd64] needs: [build-ubuntu-21_10-amd64]
image: registry.nic.cz/labs/bird:ubuntu-20.10-amd64 image: registry.nic.cz/labs/bird:ubuntu-21.10-amd64
#pkg-ubuntu-21.04-amd64: #pkg-ubuntu-21.04-amd64:
# <<: *pkg-deb # <<: *pkg-deb

5
misc/docker/ubuntu-20.10-amd64/Dockerfile → misc/docker/ubuntu-21.10-amd64/Dockerfile
View file

@ -1,9 +1,10 @@
FROM ubuntu:20.10 FROM ubuntu:21.10
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list RUN sed -i 's/deb.debian.org/ftp.cz.debian.org/' /etc/apt/sources.list
RUN apt-get -y update RUN apt-get -y update
RUN apt-get -y upgrade RUN apt-get -y upgrade
RUN apt-get -y install \ RUN apt-get -y --no-install-recommends install \
tzdata \
build-essential \ build-essential \
flex \ flex \
bison \ bison \