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 diff --git a/coreapp-ci/node-python/Dockerfile b/coreapp-ci/node-python/Dockerfile index 202bf51..bdb3426 100644 --- a/coreapp-ci/node-python/Dockerfile +++ b/coreapp-ci/node-python/Dockerfile @@ -1,13 +1,13 @@ -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 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} diff --git a/coreapp/10/Dockerfile b/coreapp/10/Dockerfile index 9a280c6..524d1e1 100644 --- a/coreapp/10/Dockerfile +++ b/coreapp/10/Dockerfile @@ -1,22 +1,18 @@ FROM apiaryio/nodejs:10 MAINTAINER Apiary -ENV REFRESHED_AT 2019-01-18 +ENV REFRESHED_AT 2019-10-23 -ENV MONGO_MAJOR 3.2 -ENV MONGO_VERSION 3.2.15 -ENV MONGO_GPG=EA312927 USER root -RUN apt-get install -y wget \ - && 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 \ +RUN apt-get update \ + && apt-get install -y wget apt-transport-https ca-certificates \ && 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 \ - && 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 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 \ @@ -33,3 +29,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 + diff --git a/debian-minimal/Dockerfile b/debian-minimal/Dockerfile deleted file mode 100644 index 87bae2b..0000000 --- a/debian-minimal/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -FROM debian:jessie -MAINTAINER Apiary - -ENV REFRESHED_AT 2016-02-15 - -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/* 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 + 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..01b7133 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 OSS +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 diff --git a/nodejs/10/Dockerfile b/nodejs/10/Dockerfile index 15f7c19..b9e1302 100644 --- a/nodejs/10/Dockerfile +++ b/nodejs/10/Dockerfile @@ -1,7 +1,7 @@ -FROM node:dubnium +FROM node:10.15.3-stretch MAINTAINER Apiary -ENV REFRESHED_AT 2019-01-18 +ENV REFRESHED_AT 2019-08-13 ENV NPM_VERSION=6.4.1 USER root 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