diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f9460804d8cb89b51c34d9d43ebbadb170d37710..26523af0d832cd5f12318d280597e6a4cb9f310c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,9 +15,10 @@ build-docker: image: docker:25.0.5-git stage: prepare rules: - - if: $CI_PIPELINE_SOURCE != "schedule" - when: manual - allow_failure: false + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + - if: $CI_COMMIT_BRANCH == "master" + - if: $CI_COMMIT_TAG + - when: manual tags: - generic_privileged variables: diff --git a/Dockerfile b/Dockerfile index 3560342c0c91d37cba861623fe5b09cab948bc1c..082a2f8ad2c7cf9cf40f7bdcdfd507c1a400b43e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 ENV CHROMIUM_DIR "/srv/chromium" -ENV CHROMIUM_VER "138.0.7204.50" +ENV CHROMIUM_VER "138.0.7204.97" ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \