Skip to content

Commit

Permalink
add postgres to ci/builder image (#567)
Browse files Browse the repository at this point in the history
* add postgres to ci/builder image

* update circleci
  • Loading branch information
eranrund authored Nov 25, 2020
1 parent 5e058cd commit a439b9a
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
version: 2.1

defaults:
builder-install: &builder-install gcr.io/mobilenode-211420/builder-install:1_12
builder-install: &builder-install gcr.io/mobilenode-211420/builder-install:1_13
default-xcode-version: &default-xcode-version "12.0.0"

default-environment: &default-environment
Expand Down
37 changes: 21 additions & 16 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,50 +21,55 @@ FROM ubuntu:18.04 AS builder-install
#
SHELL ["/bin/bash", "-c"]

# Certain Installers make 'installations' easier by having a nice front-end. While this is great when you have a manual install, this becomes an issue during automated installations.
ENV DEBIAN_FRONTEND=noninteractive

# Install build tools and dependencies
#
RUN apt-get update -q -q && \
apt-get upgrade --yes --force-yes && \
apt-get install --yes --force-yes \
automake \
autoconf \
alien \
autoconf \
automake \
binutils-dev \
build-essential \
libclang-dev \
clang \
cmake \
curl \
libcurl4-openssl-dev \
libdw-dev \
git \
golang \
libiberty-dev \
jq \
libclang-dev \
libcurl4-openssl-dev \
libdw-dev \
libiberty-dev \
libpq-dev \
libprotobuf-c-dev \
libprotobuf-dev \
libssl-dev \
libssl1.1 \
libsystemd-dev \
libtool \
libxml2-dev \
llvm-dev \
nano \
ninja-build \
ocaml-native-compilers \
ocamlbuild \
patch \
protobuf-compiler \
protobuf-c-compiler \
libprotobuf-c-dev \
libprotobuf-dev \
psmisc \
pkg-config \
postgresql-10 \
prometheus \
protobuf-c-compiler \
protobuf-compiler \
psmisc \
python \
python3-pip \
libssl1.1 \
libssl-dev \
systemd \
libsystemd-dev \
libtool \
unzip \
uuid-dev \
wget \
libxml2-dev \
zlib1g-dev

# psmisc = killall
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1_12
1_13
2 changes: 1 addition & 1 deletion jenkins/build-pod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
topologyKey: "kubernetes.io/hostname"
containers:
- name: rust-builder-default
image: gcr.io/mobilenode-211420/builder-install:1_12
image: gcr.io/mobilenode-211420/builder-install:1_13
env:
- name: PATH
value: "/root/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/intel/sgxsdk/bin:/opt/intel/sgxsdk/bin/x64"
Expand Down

0 comments on commit a439b9a

Please sign in to comment.