From 9eed7d7841e30a70b7c3565d44740416952300b4 Mon Sep 17 00:00:00 2001 From: Thomas Jandecka Date: Tue, 30 Apr 2019 15:53:00 +0200 Subject: [PATCH 01/17] feat: added Debian based images with CMake >= 3.6 for C++ CI * includes ruby-aruba for apiaryio/drafter; no time to bundle around --- drafter-ci/clang-4.0/Dockerfile | 9 +++++++++ drafter-ci/clang-latest/Dockerfile | 9 +++++++++ drafter-ci/gcc-4.9/Dockerfile | 12 ++++++++++++ drafter-ci/gcc-latest/Dockerfile | 9 +++++++++ 4 files changed, 39 insertions(+) create mode 100644 drafter-ci/clang-4.0/Dockerfile create mode 100644 drafter-ci/clang-latest/Dockerfile create mode 100644 drafter-ci/gcc-4.9/Dockerfile create mode 100644 drafter-ci/gcc-latest/Dockerfile diff --git a/drafter-ci/clang-4.0/Dockerfile b/drafter-ci/clang-4.0/Dockerfile new file mode 100644 index 0000000..8fae386 --- /dev/null +++ b/drafter-ci/clang-4.0/Dockerfile @@ -0,0 +1,9 @@ +FROM debian:stretch-slim + +RUN apt-get update && \ + apt-get install -y clang-4.0 make cmake git-core valgrind ruby ruby-dev ruby-aruba && \ + update-alternatives --install /usr/bin/cc cc /usr/bin/clang-4.0 100 && \ + update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-4.0 100 + +CMD bash + diff --git a/drafter-ci/clang-latest/Dockerfile b/drafter-ci/clang-latest/Dockerfile new file mode 100644 index 0000000..1419a52 --- /dev/null +++ b/drafter-ci/clang-latest/Dockerfile @@ -0,0 +1,9 @@ +FROM debian:sid-slim + +RUN apt-get update && \ + apt-get install -y clang-8 cmake git-core valgrind ruby ruby-dev ruby-aruba && \ + update-alternatives --install /usr/bin/cc cc /usr/bin/clang-8 100 && \ + update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-8 100 + +CMD bash + diff --git a/drafter-ci/gcc-4.9/Dockerfile b/drafter-ci/gcc-4.9/Dockerfile new file mode 100644 index 0000000..f1f8111 --- /dev/null +++ b/drafter-ci/gcc-4.9/Dockerfile @@ -0,0 +1,12 @@ +FROM debian:jessie-slim + +RUN apt-get update && \ + apt-get install -y gcc g++ make git-core valgrind ruby ruby-dev ruby-aruba wget && \ + update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 && \ + update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100 && \ + wget -O cmake-installer.sh https://github.com/Kitware/CMake/releases/download/v3.13.4/cmake-3.13.4-Linux-x86_64.sh && \ + chmod +x cmake-installer.sh && \ + ./cmake-installer.sh --skip-license --prefix=/usr/local + +CMD bash + diff --git a/drafter-ci/gcc-latest/Dockerfile b/drafter-ci/gcc-latest/Dockerfile new file mode 100644 index 0000000..91904d3 --- /dev/null +++ b/drafter-ci/gcc-latest/Dockerfile @@ -0,0 +1,9 @@ +FROM debian:sid-slim + +RUN apt-get update && \ + apt-get install -y gcc g++ cmake git-core valgrind ruby ruby-dev ruby-aruba && \ + update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 100 && \ + update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 100 + +CMD bash + From f8ceb5725c78f9a4112a6285a57f998b7269431c Mon Sep 17 00:00:00 2001 From: Ladislav Prskavec Date: Fri, 10 May 2019 13:27:53 +0200 Subject: [PATCH 02/17] feat: add support for OCI --- coreapp-ci/circleci/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapp-ci/circleci/Dockerfile b/coreapp-ci/circleci/Dockerfile index 06a4e7e..127400f 100644 --- a/coreapp-ci/circleci/Dockerfile +++ b/coreapp-ci/circleci/Dockerfile @@ -1,12 +1,12 @@ FROM circleci/python MAINTAINER Apiary -ENV REFRESHED_AT 2017-07-24 +ENV REFRESHED_AT 2019-05-10 USER root RUN apt-get update \ - && apt-get install -y --no-install-recommends gawk \ - && pip install -U awscli + && apt-get install -y --no-install-recommends gawk \ + && pip install -U awscli oci-cli USER circleci From 5692908fe51d6187f55c1250e6e655e83a5dd47a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kor=C3=A1l?= Date: Mon, 1 Jul 2019 17:43:31 +0200 Subject: [PATCH 03/17] feat: update node-python coreapp to Node.js 10 --- coreapp-ci/node-python/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapp-ci/node-python/Dockerfile b/coreapp-ci/node-python/Dockerfile index 202bf51..6270f89 100644 --- a/coreapp-ci/node-python/Dockerfile +++ b/coreapp-ci/node-python/Dockerfile @@ -1,8 +1,8 @@ -FROM circleci/node:8 +FROM circleci/node:10 MAINTAINER Apiary -ENV REFRESHED_AT 2018-08-01 -ENV NPM_VERSION 4.6.1 +ENV REFRESHED_AT 2019-07-01 +ENV NPM_VERSION 6.4.1 USER root From 012fb19aa0bfc17fccedf5840f41e69a3f0f1853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Kor=C3=A1l?= Date: Wed, 3 Jul 2019 14:54:03 +0200 Subject: [PATCH 04/17] fix: also install python-setuptools --- coreapp-ci/node-python/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapp-ci/node-python/Dockerfile b/coreapp-ci/node-python/Dockerfile index 6270f89..bdb3426 100644 --- a/coreapp-ci/node-python/Dockerfile +++ b/coreapp-ci/node-python/Dockerfile @@ -7,7 +7,7 @@ ENV NPM_VERSION 6.4.1 USER root RUN apt-get update \ - && apt-get install -y --no-install-recommends gawk python-pip python-dev \ + && apt-get install -y --no-install-recommends gawk python-pip python-dev python-setuptools \ && pip install -U awscli \ && npm i -g npm@${NPM_VERSION} From ead4b99523e27e1d9079f834b6f39ac151ad4326 Mon Sep 17 00:00:00 2001 From: Ladislav Prskavec Date: Thu, 25 Jul 2019 11:10:01 +0200 Subject: [PATCH 05/17] feat: add mongodb 3.4 version and remove 3.0 --- mongodb/{3.0 => 3.4}/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename mongodb/{3.0 => 3.4}/Dockerfile (50%) diff --git a/mongodb/3.0/Dockerfile b/mongodb/3.4/Dockerfile similarity index 50% rename from mongodb/3.0/Dockerfile rename to mongodb/3.4/Dockerfile index 0f3a1da..22a809c 100644 --- a/mongodb/3.0/Dockerfile +++ b/mongodb/3.4/Dockerfile @@ -1,7 +1,8 @@ -FROM mongo:3.0.12 +# do not upgrade to versions >3.4.18 as they are under the SSPL which is not +FROM mongo:3.4.18 MAINTAINER Apiary -ENV REFRESHED_AT 2016-07-18 +ENV REFRESHED_AT 2019-07-25 RUN chown -R mongodb:mongodb /data/db From b5b3aca7a82e0d7741e4136a49cc76b76c3de474 Mon Sep 17 00:00:00 2001 From: Ladislav Prskavec Date: Thu, 25 Jul 2019 11:17:19 +0200 Subject: [PATCH 06/17] Update mongodb/3.4/Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Jakub Korál --- mongodb/3.4/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongodb/3.4/Dockerfile b/mongodb/3.4/Dockerfile index 22a809c..01b7133 100644 --- a/mongodb/3.4/Dockerfile +++ b/mongodb/3.4/Dockerfile @@ -1,4 +1,4 @@ -# do not upgrade to versions >3.4.18 as they are under the SSPL which is not +# do not upgrade to versions >3.4.18 as they are under the SSPL which is not OSS FROM mongo:3.4.18 MAINTAINER Apiary From 7c6a1a7cbb6a33a2a260467e287b41c00262a99d Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Thu, 8 Aug 2019 17:24:01 +0200 Subject: [PATCH 07/17] chore: switch debian to stretch release --- debian-minimal/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian-minimal/Dockerfile b/debian-minimal/Dockerfile index 87bae2b..ab7c04e 100644 --- a/debian-minimal/Dockerfile +++ b/debian-minimal/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch MAINTAINER Apiary ENV REFRESHED_AT 2016-02-15 From 7358c13d667ea1de22aba71038f5a6cadd227017 Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Thu, 8 Aug 2019 17:26:56 +0200 Subject: [PATCH 08/17] chore: update debian to buster release --- debian-minimal/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian-minimal/Dockerfile b/debian-minimal/Dockerfile index ab7c04e..79a0e8f 100644 --- a/debian-minimal/Dockerfile +++ b/debian-minimal/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM debian:buster MAINTAINER Apiary ENV REFRESHED_AT 2016-02-15 From bf073df56744f7341e0705422812262b318154ef Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Thu, 8 Aug 2019 17:29:09 +0200 Subject: [PATCH 09/17] chore: updated refreshed at --- coreapp/10/Dockerfile | 55 +++++++++++++++++++++++++++++++++------ debian-minimal/Dockerfile | 2 +- nodejs/10/Dockerfile | 4 +-- 3 files changed, 50 insertions(+), 11 deletions(-) diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index 9a280c6..f7f2796 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -1,26 +1,65 @@ +# FROM apiaryio/nodejs:10 +# MAINTAINER Apiary + +# ENV REFRESHED_AT 2019-08-09 + +# ENV MONGO_MAJOR 3.4 +# ENV MONGO_VERSION 3.4.18 +# ENV MONGO_GPG=EA312927 +# USER root + +# RUN apt-get install -y wget \ +# && wget -q -O - https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc | apt-key add - \ +# && sh -c 'echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" >> /etc/apt/sources.list.d/mongodb-org.list' \ +# && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ +# && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ +# && wget -q -O - https://packages.sury.org/php/apt.gpg | apt-key add - \ +# && sh -c 'echo "deb https://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list.d/php.list' \ +# && apt-get update \ +# && apt-get install -y mongodb-org-shell=$MONGO_VERSION \ +# google-chrome-stable \ +# xvfb \ +# php-common \ +# php-cli \ +# php-curl \ +# libkrb5-dev \ +# ruby \ +# ruby-dev \ +# build-essential \ +# libssl-dev \ +# redis-tools \ +# vnc4server \ +# && gem install rest-client \ +# && /sbin/ldconfig -v + +# RUN npm install -g coffee-script@1.11.0 grunt-cli@1.2.0 +# RUN npm install -g node-gyp + + FROM apiaryio/nodejs:10 MAINTAINER Apiary -ENV REFRESHED_AT 2019-01-18 +ENV REFRESHED_AT 2019-08-09 -ENV MONGO_MAJOR 3.2 -ENV MONGO_VERSION 3.2.15 +ENV MONGO_MAJOR 3.4 +ENV MONGO_VERSION 3.4.18 ENV MONGO_GPG=EA312927 USER root RUN apt-get install -y wget \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv $MONGO_GPG \ + && wget -qO - https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc | apt-key add - \ + # && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv $MONGO_GPG \ && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" > /etc/apt/sources.list.d/mongodb-org.list \ && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && echo "deb http://ftp.debian.org/debian jessie-backports main" >> /etc/apt/sources.list.d/jessie.backports.list \ + # && echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list.d/jessie.backports.list \ && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ && apt-get update \ && apt-get install -y mongodb-org-shell=$MONGO_VERSION \ google-chrome-stable \ xvfb \ - php-common \ - php-cli \ - php-curl \ + # php-common \ + # php-cli \ + # php-curl \ libkrb5-dev \ ruby \ ruby-dev \ diff --git a/debian-minimal/Dockerfile b/debian-minimal/Dockerfile index 79a0e8f..e4ebc94 100644 --- a/debian-minimal/Dockerfile +++ b/debian-minimal/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster MAINTAINER Apiary -ENV REFRESHED_AT 2016-02-15 +ENV REFRESHED_AT 2019-08-08 RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/nodejs/10/Dockerfile b/nodejs/10/Dockerfile index 15f7c19..47f763a 100644 --- a/nodejs/10/Dockerfile +++ b/nodejs/10/Dockerfile @@ -1,7 +1,7 @@ -FROM node:dubnium +FROM node:dubnium-jessie MAINTAINER Apiary -ENV REFRESHED_AT 2019-01-18 +ENV REFRESHED_AT 2019-08-09 ENV NPM_VERSION=6.4.1 USER root From 8b45adf09b6ef5315951d7c78c77acbef5691c96 Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Fri, 9 Aug 2019 15:04:04 +0200 Subject: [PATCH 10/17] chore: install php --- coreapp/10/Dockerfile | 52 +++++++------------------------------------ 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index f7f2796..5c818f9 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -1,41 +1,3 @@ -# FROM apiaryio/nodejs:10 -# MAINTAINER Apiary - -# ENV REFRESHED_AT 2019-08-09 - -# ENV MONGO_MAJOR 3.4 -# ENV MONGO_VERSION 3.4.18 -# ENV MONGO_GPG=EA312927 -# USER root - -# RUN apt-get install -y wget \ -# && wget -q -O - https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc | apt-key add - \ -# && sh -c 'echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" >> /etc/apt/sources.list.d/mongodb-org.list' \ -# && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ -# && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ -# && wget -q -O - https://packages.sury.org/php/apt.gpg | apt-key add - \ -# && sh -c 'echo "deb https://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list.d/php.list' \ -# && apt-get update \ -# && apt-get install -y mongodb-org-shell=$MONGO_VERSION \ -# google-chrome-stable \ -# xvfb \ -# php-common \ -# php-cli \ -# php-curl \ -# libkrb5-dev \ -# ruby \ -# ruby-dev \ -# build-essential \ -# libssl-dev \ -# redis-tools \ -# vnc4server \ -# && gem install rest-client \ -# && /sbin/ldconfig -v - -# RUN npm install -g coffee-script@1.11.0 grunt-cli@1.2.0 -# RUN npm install -g node-gyp - - FROM apiaryio/nodejs:10 MAINTAINER Apiary @@ -47,19 +9,20 @@ ENV MONGO_GPG=EA312927 USER root RUN apt-get install -y wget \ + && wget -qO - https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc | apt-key add - \ - # && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv $MONGO_GPG \ - && echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" > /etc/apt/sources.list.d/mongodb-org.list \ + && sh -c 'echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" >> /etc/apt/sources.list.d/mongodb-org.list' \ && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - # && echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list.d/jessie.backports.list \ && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ + && wget -q https://packages.sury.org/php/apt.gpg -O- | apt-key add - \ + && sh -c 'echo "deb http://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list.d/php.list' \ && apt-get update \ && apt-get install -y mongodb-org-shell=$MONGO_VERSION \ google-chrome-stable \ xvfb \ - # php-common \ - # php-cli \ - # php-curl \ + php-common \ + php-cli \ + php-curl \ libkrb5-dev \ ruby \ ruby-dev \ @@ -72,3 +35,4 @@ RUN apt-get install -y wget \ RUN npm install -g coffee-script@1.11.0 grunt-cli@1.2.0 RUN npm install -g node-gyp + From dd6cd624c8d2775a3f9c7eb6d5ff98689a79db04 Mon Sep 17 00:00:00 2001 From: Nada Jasikova Date: Mon, 12 Aug 2019 10:52:19 +0200 Subject: [PATCH 11/17] feat(coreapp:10): support for https repositories --- coreapp/10/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index 5c818f9..891a648 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -8,14 +8,14 @@ ENV MONGO_VERSION 3.4.18 ENV MONGO_GPG=EA312927 USER root -RUN apt-get install -y wget \ - +RUN apt-get update \ + && apt-get install -y wget apt-transport-https ca-certificates \ && wget -qO - https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc | apt-key add - \ - && sh -c 'echo "deb http://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" >> /etc/apt/sources.list.d/mongodb-org.list' \ + && sh -c 'echo "deb https://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" >> /etc/apt/sources.list.d/mongodb-org.list' \ && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ + && sh -c 'echo "deb https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ && wget -q https://packages.sury.org/php/apt.gpg -O- | apt-key add - \ - && sh -c 'echo "deb http://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list.d/php.list' \ + && sh -c 'echo "deb https://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list.d/php.list' \ && apt-get update \ && apt-get install -y mongodb-org-shell=$MONGO_VERSION \ google-chrome-stable \ From 969f8bfe812ee8e6b839cbf6b852d67692eec9ce Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Mon, 12 Aug 2019 14:02:23 +0200 Subject: [PATCH 12/17] chore(debian): remove the debian image --- coreapp/10/Dockerfile | 1 - debian-minimal/Dockerfile | 14 -------------- 2 files changed, 15 deletions(-) delete mode 100644 debian-minimal/Dockerfile diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index 891a648..21aedbf 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -5,7 +5,6 @@ ENV REFRESHED_AT 2019-08-09 ENV MONGO_MAJOR 3.4 ENV MONGO_VERSION 3.4.18 -ENV MONGO_GPG=EA312927 USER root RUN apt-get update \ diff --git a/debian-minimal/Dockerfile b/debian-minimal/Dockerfile deleted file mode 100644 index e4ebc94..0000000 --- a/debian-minimal/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM debian:buster -MAINTAINER Apiary - -ENV REFRESHED_AT 2019-08-08 - -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - apt-get autoremove -y && \ - rm -rf /usr/share/locale/* && \ - rm -rf /var/cache/debconf/*-old && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /usr/share/doc/* From 423c16e131d9a2ab5fd20f3f1a26ba7ebc46a441 Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Tue, 13 Aug 2019 13:52:04 +0200 Subject: [PATCH 13/17] chore(nodejs): switch to node 10.15 --- coreapp/10/Dockerfile | 9 ++------- nodejs/10/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index 21aedbf..2515edd 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -1,23 +1,18 @@ FROM apiaryio/nodejs:10 MAINTAINER Apiary -ENV REFRESHED_AT 2019-08-09 +ENV REFRESHED_AT 2019-08-13 -ENV MONGO_MAJOR 3.4 -ENV MONGO_VERSION 3.4.18 USER root RUN apt-get update \ && apt-get install -y wget apt-transport-https ca-certificates \ - && wget -qO - https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc | apt-key add - \ - && sh -c 'echo "deb https://repo.mongodb.org/apt/debian jessie/mongodb-org/$MONGO_MAJOR main" >> /etc/apt/sources.list.d/mongodb-org.list' \ && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ && sh -c 'echo "deb https://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ && wget -q https://packages.sury.org/php/apt.gpg -O- | apt-key add - \ && sh -c 'echo "deb https://packages.sury.org/php/ jessie main" >> /etc/apt/sources.list.d/php.list' \ && apt-get update \ - && apt-get install -y mongodb-org-shell=$MONGO_VERSION \ - google-chrome-stable \ + && apt-get install -y google-chrome-stable \ xvfb \ php-common \ php-cli \ diff --git a/nodejs/10/Dockerfile b/nodejs/10/Dockerfile index 47f763a..5cdd8e2 100644 --- a/nodejs/10/Dockerfile +++ b/nodejs/10/Dockerfile @@ -1,7 +1,7 @@ -FROM node:dubnium-jessie +FROM node:10.15.3-jessie MAINTAINER Apiary -ENV REFRESHED_AT 2019-08-09 +ENV REFRESHED_AT 2019-08-13 ENV NPM_VERSION=6.4.1 USER root From a6b4b727c18abfc2bec7479e00baf34286fa8a93 Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Tue, 13 Aug 2019 15:02:41 +0200 Subject: [PATCH 14/17] chore(nodejs): switch debian to stretch --- nodejs/10/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodejs/10/Dockerfile b/nodejs/10/Dockerfile index 5cdd8e2..b9e1302 100644 --- a/nodejs/10/Dockerfile +++ b/nodejs/10/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10.15.3-jessie +FROM node:10.15.3-stretch MAINTAINER Apiary ENV REFRESHED_AT 2019-08-13 From ece7327944db6f20b84766ea3521c0daa42684bf Mon Sep 17 00:00:00 2001 From: Daria Grudzien Date: Thu, 12 Sep 2019 14:56:44 +0200 Subject: [PATCH 15/17] chore(oci-cli): refresh the image to get the latest version of cli --- oci-cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oci-cli/Dockerfile b/oci-cli/Dockerfile index fc53d47..b0d689b 100644 --- a/oci-cli/Dockerfile +++ b/oci-cli/Dockerfile @@ -1,7 +1,7 @@ FROM apiaryio/oraclelinux:python36 MAINTAINER Apiary -ENV REFRESHED_AT 2018-11-06 +ENV REFRESHED_AT 2019-09-12 ENV LC_ALL en_US.UTF-8 RUN pip3 install oci-cli From 5a29dbb128c8a9bcafd279439e6ff439b082beae Mon Sep 17 00:00:00 2001 From: Tomas Mechura Date: Tue, 15 Oct 2019 12:31:32 +0200 Subject: [PATCH 16/17] chore: coreApp - bump to install chrome 77 --- coreapp/10/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index 2515edd..b33fec7 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -1,7 +1,7 @@ FROM apiaryio/nodejs:10 MAINTAINER Apiary -ENV REFRESHED_AT 2019-08-13 +ENV REFRESHED_AT 2019-10-15 USER root From c78ea8e8d2678a6f7d0424965685cc2fe8655462 Mon Sep 17 00:00:00 2001 From: tomas-mechura <34160558+tomas-mechura@users.noreply.github.com> Date: Wed, 23 Oct 2019 17:11:27 +0200 Subject: [PATCH 17/17] chore: bump REFRESHED_AT for chrome 78 --- coreapp/10/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index b33fec7..524d1e1 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -1,7 +1,7 @@ FROM apiaryio/nodejs:10 MAINTAINER Apiary -ENV REFRESHED_AT 2019-10-15 +ENV REFRESHED_AT 2019-10-23 USER root