diff options
author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-07-29 18:51:41 +0000 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-07-29 18:51:41 +0000 |
commit | 32877aebd06d6620f062feccec56b1c66a824eb4 (patch) | |
tree | 94c06ae9bd82c70e7524d5ae3d126da0d1971b15 | |
parent | 0622fb282c0b008980ab72172dbdfe38bde3431e (diff) | |
download | epiphany-32877aebd06d6620f062feccec56b1c66a824eb4.tar.gz |
Revert "Use own docker image for check-code-style"
This reverts commit 0622fb282c0b008980ab72172dbdfe38bde3431e
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .gitlab-ci/Dockerfile | 14 | ||||
-rw-r--r-- | .gitlab-ci/README.md | 23 | ||||
-rwxr-xr-x | .gitlab-ci/run-docker.sh | 18 |
4 files changed, 3 insertions, 56 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b52f6d8f1..c83d7b23a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,8 +12,10 @@ stages: check-code-style: stage: .pre - image: registry.gitlab.gnome.org/gnome/epiphany/master:v1 + image: alpine:latest interruptible: true + before_script: + - apk update && apk add uncrustify bash python3 script: - bash data/check-code-style diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile deleted file mode 100644 index 17715a71e..000000000 --- a/.gitlab-ci/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM fedora:rawhide - -RUN dnf update -y \ - && dnf install -y uncrustify git \ - && dnf clean all - -ARG HOST_USER_ID=5555 -ENV HOST_USER_ID ${HOST_USER_ID} -RUN useradd -u $HOST_USER_ID -ms /bin/bash user - -USER user -WORKDIR /home/user - -ENV LANG C.UTF-8 diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md deleted file mode 100644 index 41dfd7559..000000000 --- a/.gitlab-ci/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# CI support stuff - -## Docker image - -GitLab CI jobs run in a Docker image, defined here. To update that image -(perhaps to install some more packages): - -1. Edit `.gitlab-ci/Dockerfile` with the changes you want -2. Edit `.gitlab-ci/run-docker.sh` and bump the version in `TAG` -3. Run `.gitlab-ci/run-docker.sh` to build the new image, and launch a shell - inside it - * When you're done, exit the shell in the usual way -4. Run `.gitlab-ci/run-docker.sh --push` to upload the new image to the GNOME - GitLab Docker registry - * If this is the first time you're doing this, you'll need to log into the - registry - * If you use 2-factor authentication on your GNOME GitLab account, you'll - need to [create a personal access token][pat] and use that rather than - your normal password -5. Edit `.gitlab-ci.yml` (in the root of this repository) to use your new - image - -[pat]: https://gitlab.gnome.org/profile/personal_access_tokens diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh deleted file mode 100755 index f0ed28c61..000000000 --- a/.gitlab-ci/run-docker.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -set -e - -TAG="registry.gitlab.gnome.org/gnome/epiphany/master:v1" - -cd "$(dirname "$0")" - -podman build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" --format=docker . - -if [ "$1" = "--push" ]; then - podman login registry.gitlab.gnome.org - podman push $TAG -else - podman run --rm \ - --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \ - --tty --interactive "${TAG}" bash -fi |