diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 34f90e4..830a26d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,10 +32,8 @@ ruby-2.3-git-2.7-phantomjs-2.1 test: *test_build ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1 test: *test_build ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1 test: *test_build ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6 test: *test_build -ruby-2.3-static-analyses test: *test_build www-gitlab-com test: *test_build doc-gitlab-com test: *test_build -terraform-0.1 test: *test_build gitlab-qa test: *test_build golang-1.5-git-2.8.4 test: *test_build golang-1.6-git-2.8.4 test: *test_build @@ -47,10 +45,8 @@ ruby-2.3-git-2.7-phantomjs-2.1: *build_and_deploy ruby-2.3.3-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1: *build_and_deploy ruby-2.3.3-golang-1.8-git-2.7-phantomjs-2.1-node-7.1-postgresql-9.6: *build_and_deploy -ruby-2.3-static-analyses: *build_and_deploy www-gitlab-com: *build_and_deploy doc-gitlab-com: *build_and_deploy -terraform-0.1: *build_and_deploy gitlab-qa: *build_and_deploy golang-1.5-git-2.8.4: *build_and_deploy golang-1.6-git-2.8.4: *build_and_deploy diff --git a/Dockerfile.ruby-2.3-static-analyses b/Dockerfile.ruby-2.3-static-analyses deleted file mode 100644 index f7a43c5..0000000 --- a/Dockerfile.ruby-2.3-static-analyses +++ /dev/null @@ -1,4 +0,0 @@ -FROM ruby:2.3-alpine - -RUN gem install knapsack -RUN apk add --update bash && rm -rf /var/cache/apk/* \ No newline at end of file diff --git a/Dockerfile.terraform-0.1 b/Dockerfile.terraform-0.1 deleted file mode 100644 index d2547b9..0000000 --- a/Dockerfile.terraform-0.1 +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:xenial - -RUN apt-get update -y -RUN apt-get install -y sudo curl git unzip wget unzip -RUN wget -nc https://releases.hashicorp.com/terraform/0.8.5/terraform_0.8.5_linux_amd64.zip -O terraform.zip -RUN unzip terraform.zip - -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8