From f10563ed4b5df677587f50c6da35f6d171d5d3be Mon Sep 17 00:00:00 2001
From: Erick Hitter <gitlab-s@mxs.ethitter.com>
Date: Sun, 24 Feb 2019 02:42:38 +0000
Subject: [PATCH] Use correct image for CI
https://github.com/koalaman/shellcheck/issues/1069
---
.gitlab-ci.yml | 28 +++++++++++++++++++++++++++-
debian/jessie/Dockerfile | 33 +++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 debian/jessie/Dockerfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9395913..1e5a6d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ before_script:
# TESTS
#
-lint_dockerfile:
+lint-dockerfile:
stage: test
image: hadolint/hadolint:latest-debian
before_script:
@@ -19,6 +19,14 @@ lint_dockerfile:
script:
- find . -name "Dockerfile" -execdir hadolint {} \;
+lint-shell-script:
+ stage: test
+ image: koalaman/shellcheck-alpine:latest
+ before_script:
+ - shellcheck -V
+ script:
+ - find . -name "*.sh" -exec shellcheck {} \;
+
#
# IMAGE BUILDS/PUSHES
#
@@ -41,6 +49,24 @@ build-golang-dev:
except:
- master
+# Debian Jessie builds
+build-debian-jessie-build-master:
+ stage: deploy
+ script:
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:jessie" ./debian/jessie
+ - docker push "$CI_REGISTRY_IMAGE/debian:jessie"
+ only:
+ - master
+ when: manual
+
+build-debian-jessie-build-dev:
+ stage: deploy
+ script:
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/debian:jessie-dev" ./debian/jessie
+ - docker push "$CI_REGISTRY_IMAGE/debian:jessie-dev"
+ except:
+ - master
+
# PHP 7.3
build-php-7.3-master:
stage: deploy
diff --git a/debian/jessie/Dockerfile b/debian/jessie/Dockerfile
new file mode 100644
index 0000000..8035486
--- /dev/null
+++ b/debian/jessie/Dockerfile
@@ -0,0 +1,33 @@
+FROM debian:jessie
+
+LABEL maintainer="ethitter"
+LABEL version="1.0"
+
+RUN echo "deb http://security.debian.org/ jessie/updates main" >> /etc/apt/sources.list
+
+RUN apt-get update \
+ && apt-get -yqqf --no-install-recommends install \
+ apt-transport-https \
+ lsb-release \
+ ca-certificates \
+ curl \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+RUN curl -ssL -o /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list
+
+RUN apt-get update \
+ && apt-get -y --no-install-recommends install \
+ git \
+ dh-make \
+ build-essential \
+ autoconf \
+ autotools-dev \
+ libpcre3 \
+ libpcre3-dev \
+ libz-dev \
+ gnupg \
+ libssl-dev \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
--
GitLab