diff options
| author | Max Wittig <max.wittig95@gmail.com> | 2019-10-06 18:06:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-06 18:06:39 +0200 |
| commit | fcea41c61f7776cf57ed5001facbc1e77d2834c4 (patch) | |
| tree | 6972ca405b7a506c3afa57f8f88bca4136e356c8 | |
| parent | 214f7ef5f3b6e99b7756982c5b883e40d3b22657 (diff) | |
| parent | a14c02ef85bd4d273b8c7f0f6bd07680c91955fa (diff) | |
| download | gitlab-fcea41c61f7776cf57ed5001facbc1e77d2834c4.tar.gz | |
Merge pull request #897 from python-gitlab/refactor/remove-obsolete-image
refactor: remove obsolete test image
| -rw-r--r-- | .gitlab-ci.yml | 11 | ||||
| -rw-r--r-- | tools/Dockerfile-test | 34 |
2 files changed, 0 insertions, 45 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13556d3..3582693 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,17 +3,6 @@ image: python:3.7 stages: - deploy -build_test_image: - stage: deploy - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/tools/Dockerfile-test --destination $CI_REGISTRY_IMAGE:test - only: - - tags - deploy: stage: deploy script: diff --git a/tools/Dockerfile-test b/tools/Dockerfile-test deleted file mode 100644 index e18893e..0000000 --- a/tools/Dockerfile-test +++ /dev/null @@ -1,34 +0,0 @@ -FROM ubuntu:16.04 -# based on Vincent Robert <vincent.robert@genezys.net> initial Dockerfile -MAINTAINER Gauvain Pocentek <gauvain@pocentek.net> - -# Install required packages -RUN apt-get update \ - && apt-get install -qy --no-install-recommends \ - openssh-server \ - ca-certificates \ - curl \ - tzdata \ - && curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | bash \ - && apt-get install -qy --no-install-recommends \ - gitlab-ce - -# Manage SSHD through runit -RUN mkdir -p /opt/gitlab/sv/sshd/supervise \ - && mkfifo /opt/gitlab/sv/sshd/supervise/ok \ - && printf "#!/bin/sh\nexec 2>&1\numask 077\nexec /usr/sbin/sshd -D" > /opt/gitlab/sv/sshd/run \ - && chmod a+x /opt/gitlab/sv/sshd/run \ - && ln -s /opt/gitlab/sv/sshd /opt/gitlab/service \ - && mkdir -p /var/run/sshd - -# Default root password -RUN echo "gitlab_rails['initial_root_password'] = '5iveL!fe'" >> /etc/gitlab/gitlab.rb; \ - sed -i "s,^external_url.*,external_url 'http://gitlab.test'," /etc/gitlab/gitlab.rb; \ - echo 'pages_external_url "http://pages.gitlab.lxd/"' >> /etc/gitlab/gitlab.rb; \ - echo "gitlab_pages['enable'] = true" >> /etc/gitlab/gitlab.rb - -# Expose web & ssh -EXPOSE 80 22 - -# Default is to run runit & reconfigure -CMD sleep 3 && gitlab-ctl reconfigure & /opt/gitlab/embedded/bin/runsvdir-start |