Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CA-Certificates in AWS_Codebuild #448

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions devops/aws-codebuild/buildspec.cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ phases:
- printenv
- export PROJECT_DIR="$PWD"
- |
apt-get update
apt-get install -y software-properties-common ca-certificates
set -ex
for goal in $MAKE_GOALS; do
echo "Making '$goal'"
Expand Down
2 changes: 2 additions & 0 deletions devops/aws-codebuild/buildspec.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ phases:
- printenv
- export PROJECT_DIR="$PWD"
- |
apt-get update
apt-get install -y software-properties-common ca-certificates
set -ex
for goal in $MAKE_GOALS; do
echo "Making '$goal'"
Expand Down
33 changes: 25 additions & 8 deletions devops/docker/base/xenial/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM sovrin/dockerbase:rust-xenial-0.12.0
FROM sovrin/dockerbase:rust-xenial-0.13.0
# TODO LABEL maintainer="Name <email-address>"

ARG u_id=1000
Expand All @@ -11,7 +11,7 @@ ENV LIBSODIUM_LIB_DIR=/usr/lib
ENV LIBSODIUM_INC_DIR=/usr/include

# install libsodium from the sources
ENV LIBSODIUM_VERSION=1.0.14
ENV LIBSODIUM_VERSION=1.0.16
RUN cd /tmp \
&& curl https://download.libsodium.org/libsodium/releases/old/libsodium-${LIBSODIUM_VERSION}.tar.gz | tar -xz \
&& cd /tmp/libsodium-${LIBSODIUM_VERSION} \
Expand All @@ -21,17 +21,34 @@ RUN cd /tmp \
# need for libsodium to be reachable via pkg-config (sodiumoxide uses it)
ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH # TODO ??? is it really needed

ENV LIBINDY_VERSION=1.12.0~96
ENV LIBINDY_VERSION=1.16.0-bionic
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
&& echo "deb https://repo.sovrin.org/sdk/deb xenial rc" >> /etc/apt/sources.list \
&& echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /etc/apt/sources.list \
&& echo "deb https://repo.sovrin.org/sdk/deb bionic stable" >> /etc/apt/sources.list \
&& echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list \
&& echo "deb http://archive.ubuntu.com/ubuntu bionic main" >> /etc/apt/sources.list \
&& echo "deb http://archive.ubuntu.com/ubuntu xenial main" >> /etc/apt/sources.list \
&& apt-get update && apt-get install -y --no-install-recommends \
libssl-dev \
libindy=${LIBINDY_VERSION} \
libssl-dev \
libssl1.1 \
libsodium23 \
libindy=${LIBINDY_VERSION} \
python3-ujson=1.33-1build1 \
python3-pygments=2.2.0 \
python3-leveldb \
python3-six=1.11.0 \
python3-msgpack=0.4.6-1build1 \
python3-dateutil=2.6.1 \
python3-rocksdb=0.6.9 \
python3-setuptools=38.5.2 \
python3-orderedset=2.0 \
python3-psutil=5.4.3 \
python3-pympler=0.5 \
&& rm -rf /var/lib/apt/lists/*


RUN if [ "$u_id" != "0" ]; then \
useradd -ms /bin/bash -u $u_id $u_name; \
useradd -ms /bin/bash -u $u_id $u_name; \
fi

ENV TEST_USER_UID=$u_id
Expand All @@ -47,4 +64,4 @@ RUN cd /tmp/libsovtoken \
# TODO CMD ENTRYPOINT ...


ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.39.0
ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.43.0
2 changes: 1 addition & 1 deletion devops/docker/ci/xenial/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM sovrin/libsovtoken:base-xenial-0.39.0
FROM sovrin/libsovtoken:base-xenial-0.43.0
# TODO LABEL maintainer="Name <email-address>"

ARG LIBINDY_CRYPTO_VERSION
Expand Down
3 changes: 2 additions & 1 deletion devops/ext/docker/base/xenial/Dockerfile.0.3.0
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
ruby-dev \
rubygems \
&& gem install --no-ri --no-rdoc fpm -v $FPM_VERSION \
&& apt --only-upgrade install -y libgnutls30 \
&& rm -rf /var/lib/apt/lists/*


Expand All @@ -38,7 +39,7 @@ RUN set -x \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
&& export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu \
Expand Down
55 changes: 27 additions & 28 deletions devops/ext/docker/base/xenial/Dockerfile.0.8.0
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,38 @@ FROM ubuntu:xenial

# generally useful packages
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
apt-transport-https \
curl \
wget \
vim \
git \
procps \
autoconf \
automake \
g++ \
gcc \
make \
pkg-config \
zip \
unzip \
ca-certificates \
software-properties-common \
apt-transport-https \
curl \
wget \
vim \
git \
procps \
autoconf \
automake \
g++ \
gcc \
make \
pkg-config \
zip \
unzip \
&& rm -rf /var/lib/apt/lists/*


# install fpm
ENV FPM_VERSION=1.9.3
RUN apt-get update && apt-get install -y --no-install-recommends \
ruby \
ruby-dev \
rubygems \
build-essential \
autoconf \
libtool \
rpm \
RUN apt-add-repository ppa:brightbox/ruby-ng \
&& apt-get update && apt-get install -y --no-install-recommends \
ruby2.4 \
ruby2.4-dev \
build-essential \
autoconf \
libtool \
rpm \
gnupg-curl \
&& gem install rake \
&& gem install --no-ri --no-rdoc fpm -v $FPM_VERSION \
&& gem install --no-document fpm -v $FPM_VERSION \
&& rm -rf /var/lib/apt/lists/*


Expand All @@ -43,10 +45,7 @@ RUN set -x \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
&& export GNUPGHOME="$(mktemp -d)" \
&& (gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|| gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|| gpg --keyserver pgp.mit.edu --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
|| gpg --keyserver keyserver.pgp.com --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4) \
&& gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
&& gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu \
Expand Down
18 changes: 18 additions & 0 deletions devops/ext/docker/rust/xenial/Dockerfile.0.13.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM sovrin/dockerbase:base-xenial-0.8.0
# TODO LABEL maintainer="Name <email-address>"

ARG RUST_VERSION

ENV RUST_VERSION=${RUST_VERSION:-1.51.0}
ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain $RUST_VERSION \
&& chmod -R a+w $RUSTUP_HOME $CARGO_HOME \
&& rustup --version \
&& cargo --version \
&& rustc --version

# TODO CMD ENTRYPOINT ...

ENV RUST_ENV_VERSION=0.13.0