Skip to content

Commit

Permalink
Merge branch 'master' into kylef/clang-7
Browse files Browse the repository at this point in the history
  • Loading branch information
kylef authored Oct 31, 2019
2 parents 50df295 + d6c7ab0 commit 8bbf5fe
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 37 deletions.
6 changes: 3 additions & 3 deletions coreapp-ci/circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM circleci/python
MAINTAINER Apiary <[email protected]>

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
8 changes: 4 additions & 4 deletions coreapp-ci/node-python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
FROM circleci/node:8
FROM circleci/node:10
MAINTAINER Apiary <[email protected]>

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}

Expand Down
19 changes: 8 additions & 11 deletions coreapp/10/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,18 @@
FROM apiaryio/nodejs:10
MAINTAINER Apiary <[email protected]>

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 \
Expand All @@ -33,3 +29,4 @@ RUN apt-get install -y wget \

RUN npm install -g [email protected] [email protected]
RUN npm install -g node-gyp

14 changes: 0 additions & 14 deletions debian-minimal/Dockerfile

This file was deleted.

9 changes: 9 additions & 0 deletions drafter-ci/clang-4.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

9 changes: 9 additions & 0 deletions drafter-ci/clang-latest/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

12 changes: 12 additions & 0 deletions drafter-ci/gcc-4.9/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

9 changes: 9 additions & 0 deletions drafter-ci/gcc-latest/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

5 changes: 3 additions & 2 deletions mongodb/3.0/Dockerfile → mongodb/3.4/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>

ENV REFRESHED_AT 2016-07-18
ENV REFRESHED_AT 2019-07-25

RUN chown -R mongodb:mongodb /data/db

Expand Down
4 changes: 2 additions & 2 deletions nodejs/10/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM node:dubnium
FROM node:10.15.3-stretch
MAINTAINER Apiary <[email protected]>

ENV REFRESHED_AT 2019-01-18
ENV REFRESHED_AT 2019-08-13
ENV NPM_VERSION=6.4.1

USER root
Expand Down
2 changes: 1 addition & 1 deletion oci-cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM apiaryio/oraclelinux:python36
MAINTAINER Apiary <[email protected]>

ENV REFRESHED_AT 2018-11-06
ENV REFRESHED_AT 2019-09-12
ENV LC_ALL en_US.UTF-8

RUN pip3 install oci-cli
Expand Down

0 comments on commit 8bbf5fe

Please sign in to comment.