diff options
| author | bhatman1441 <blackhat1441@protonmail.com> | 2024-01-05 17:30:38 +0300 |
|---|---|---|
| committer | bhatman1441 <blackhat1441@protonmail.com> | 2024-01-05 17:30:38 +0300 |
| commit | 43e9ff88cab4ec6140dc113ae6e25bd304901641 (patch) | |
| tree | 38435f27aa0d2709362faa40c5d35cb35f85a5c0 | |
| parent | e811ce031c49a7a531e951bbbad9b8c78ebbd49d (diff) | |
Update ubuntu 22.04 dockerfile and use ubuntu 22.04 image for ci tests
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | ci/dockerfiles/ubuntu-22.04/Dockerfile | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index af560e4f3..6492635d5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # See https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings # Note that environment variables can be set in several places # See https://docs.gitlab.com/ee/ci/variables/#priority-of-environment-variables -image: registry.gitlab.com/remmina/remmina/ubuntu:20.04 +image: registry.gitlab.com/remmina/remmina/ubuntu:22.04 stages: - test - build @@ -39,7 +39,7 @@ ubuntu:devel: refs: - schedules flatpak:test: - image: registry.gitlab.com/remmina/remmina/ubuntu:20.04 + image: registry.gitlab.com/remmina/remmina/ubuntu:22.04 stage: test variables: BUNDLE: remmina-dev.flatpak @@ -47,8 +47,6 @@ flatpak:test: FLATHUB_REPO: https://dl.flathub.org/repo/flathub.flatpakrepo before_script: - apt-get update -qq - - add-apt-repository $FLATPAK_PPA -y - - apt-get update -qq - apt-get install -y -qq flatpak-builder flatpak build-essential git-core - flatpak --user remote-add --if-not-exists flathub $FLATHUB_REPO - git config --global protocol.file.allow always diff --git a/ci/dockerfiles/ubuntu-22.04/Dockerfile b/ci/dockerfiles/ubuntu-22.04/Dockerfile index 3d7a977c4..8ad5b6008 100644 --- a/ci/dockerfiles/ubuntu-22.04/Dockerfile +++ b/ci/dockerfiles/ubuntu-22.04/Dockerfile @@ -10,13 +10,12 @@ ENV DEBIAN_FRONTEND noninteractive RUN \ LC_ALL=en_US.UTF-8 apt-get update -qq \ - && apt-get install -y -qq software-properties-common python3-software-properties\ + && apt-get install -y -qq software-properties-common python3-software-properties \ && apt-add-repository ppa:remmina-ppa-team/remmina-next-daily -y \ - && apt-add-repository ppa:alexlarsson/flatpak -y \ && apt-get update -qq \ - && apt install -y -qq snapcraft flatpak-builder flatpak build-essential git-core \ + && apt install -y -qq flatpak-builder flatpak build-essential git-core \ cmake curl freerdp2-dev intltool libappindicator3-dev libasound2-dev \ - libavahi-ui-gtk3-dev libavcodec-dev libavresample-dev libavutil-dev \ + libavahi-ui-gtk3-dev libavcodec-dev libavutil-dev \ libcups2-dev libgcrypt20-dev libgnutls28-dev \ libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libgtk-3-dev \ libjpeg-dev libjson-glib-dev libpcre2-8-0 libpcre2-dev libpulse-dev \ |