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.

Sign up for GitHub

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

Jump to bottom

Update alpine base image in Dockerfiles to v3.11 #1450

Merged
merged 13 commits into from
Apr 16, 2020
Merged

Update alpine base image in Dockerfiles to v3.11 #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
404dcd2
Update alpine base image in Dockerfiles to v3.11
Apr 6, 2020
7f34b88
Merge branch 'master' into bump-alpine
Apr 7, 2020
8dd6038
use new builder images
Apr 7, 2020
dad41f0
Merge branch 'bump-alpine' of github.com:omisego/elixir-omg into bump…
Apr 7, 2020
7b99341
Merge branch 'master' into bump-alpine
Apr 9, 2020
ca697aa
Merge branch 'master' into bump-alpine
unnawut Apr 10, 2020
4e138d8
use dev image
Apr 10, 2020
1194950
use stable-20200410
Apr 13, 2020
7ef7174
Merge branch 'master' into bump-alpine
Apr 13, 2020
3179c44
Merge branch 'master' into bump-alpine
Apr 16, 2020
fec729e
Merge branch 'bump-alpine' of github.com:omisego/elixir-omg into bump…
Apr 16, 2020
4bb3d99
change snapshots and circle to stable image
Apr 16, 2020
298288f
Merge branch 'master' into bump-alpine
unnawut Apr 16, 2020
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
22 changes: 11 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ executors:

builder:
docker:
- image: omisegoimages/elixir-omg-builder:stable-20200407
- image: omisegoimages/elixir-omg-builder:stable-20200410
working_directory: ~/src

builder_pg:
docker:
- image: omisegoimages/elixir-omg-builder:stable-20200407
- image: omisegoimages/elixir-omg-builder:stable-20200410
- image: circleci/postgres:9.6-alpine
environment:
POSTGRES_USER: omisego_dev
Expand All @@ -34,7 +34,7 @@ executors:

builder_pg_geth:
docker:
- image: omisegoimages/elixir-omg-tester:stable-20200407
- image: omisegoimages/elixir-omg-tester:stable-20200410
- image: circleci/postgres:9.6-alpine
environment:
POSTGRES_USER: omisego_dev
Expand All @@ -44,7 +44,7 @@ executors:

deployer:
docker:
- image: omisegoimages/elixir-omg-deploy:stable-20200407
- image: omisegoimages/elixir-omg-deploy:stable-20200410
working_directory: ~/src

commands:
Expand Down Expand Up @@ -179,7 +179,7 @@ jobs:
- setup_elixir-omg_workspace
- run: make install-hex-rebar
- run: mix do compile --warnings-as-errors --force, credo --ignore-checks Credo.Check.Readability.SinglePipe, format --check-formatted --dry-run
- run:
- run:
command: |
export SHELL=/bin/bash
set +eo pipefail
Expand All @@ -190,7 +190,7 @@ jobs:
echo "Have you been naughty or nice? Find out if Santa knows."
exit 1
fi


lint_version:
executor: builder
Expand Down Expand Up @@ -533,9 +533,9 @@ jobs:
name: Install deps
command: |
set -e
sudo killall dpkg || true &&
sudo rm /var/lib/dpkg/lock || true &&
sudo rm /var/cache/apt/archives/lock || true &&
sudo killall dpkg || true &&
sudo rm /var/lib/dpkg/lock || true &&
sudo rm /var/cache/apt/archives/lock || true &&
sudo dpkg --configure -a || true &&
sudo apt-get update &&
./bin/setup
Expand Down Expand Up @@ -568,7 +568,7 @@ jobs:
name: Run Watcher
command: |
set -e
make start-watcher OVERRIDING_START=start_iex OVERRIDING_VARIABLES=./bin/variables_test_barebone
make start-watcher OVERRIDING_START=start_iex OVERRIDING_VARIABLES=./bin/variables_test_barebone
background: true
no_output_timeout: 2400
- run:
Expand Down Expand Up @@ -740,7 +740,7 @@ workflows:
requires:
- child_chain_coveralls_and_integration_tests
- watcher_coveralls_and_integration_tests

- common_coveralls_and_integration_tests
- test
- child_chain_coveralls_and_integration_tests:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.child_chain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.8
FROM alpine:3.11

LABEL maintainer="OmiseGO Team <omg@omise.co>"
LABEL description="Official image for OmiseGO (Child Chain) Plasma Network"
Expand Down Expand Up @@ -53,7 +53,7 @@ RUN set -xe \
#rocksdb from builder image to deployer image
RUN mkdir -p /usr/local/rocksdb/lib
RUN mkdir /usr/local/rocksdb/include
COPY --from=omisegoimages/elixir-omg-builder:stable-20200407 /usr/local/rocksdb/ /usr/local/rocksdb/
COPY --from=omisegoimages/elixir-omg-builder:stable-20200410 /usr/local/rocksdb/ /usr/local/rocksdb/

ARG release_version
ADD _build_docker/prod/child_chain-${release_version}.tar.gz /app
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.watcher
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.8
FROM alpine:3.11

LABEL maintainer="OmiseGO Team <omg@omise.co>"
LABEL description="Official image for OmiseGO (Watcher) Plasma Network"
Expand Down Expand Up @@ -54,7 +54,7 @@ RUN set -xe \
#rocksdb from builder image to deployer image
RUN mkdir -p /usr/local/rocksdb/lib
RUN mkdir /usr/local/rocksdb/include
COPY --from=omisegoimages/elixir-omg-builder:stable-20200407 /usr/local/rocksdb/ /usr/local/rocksdb/
COPY --from=omisegoimages/elixir-omg-builder:stable-20200410 /usr/local/rocksdb/ /usr/local/rocksdb/

ARG release_version
ADD _build_docker/prod/watcher-${release_version}.tar.gz /app
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.watcher_info
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.8
FROM alpine:3.11

LABEL maintainer="OmiseGO Team <omg@omise.co>"
LABEL description="Official image for OmiseGO (WatcherInfo) Plasma Network"
Expand Down Expand Up @@ -54,7 +54,7 @@ RUN set -xe \
#rocksdb from builder image to deployer image
RUN mkdir -p /usr/local/rocksdb/lib
RUN mkdir /usr/local/rocksdb/include
COPY --from=omisegoimages/elixir-omg-builder:stable-20200407 /usr/local/rocksdb/ /usr/local/rocksdb/
COPY --from=omisegoimages/elixir-omg-builder:stable-20200410 /usr/local/rocksdb/ /usr/local/rocksdb/

ARG release_version
ADD _build_docker/prod/watcher_info-${release_version}.tar.gz /app
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ WATCHER_IMAGE_NAME ?= "omisego/watcher:latest"
WATCHER_INFO_IMAGE_NAME ?= "omisego/watcher_info:latest"
CHILD_CHAIN_IMAGE_NAME ?= "omisego/child_chain:latest"

IMAGE_BUILDER ?= "omisegoimages/elixir-omg-builder:stable-20200407"
IMAGE_BUILDER ?= "omisegoimages/elixir-omg-builder:stable-20200410"
IMAGE_BUILD_DIR ?= $(PWD)

ENV_DEV ?= env MIX_ENV=dev
Expand Down Expand Up @@ -364,7 +364,7 @@ docker-remote-watcher_info:

docker-remote-childchain:
docker exec -ti childchain /app/bin/child_chain remote

.PHONY: docker-nuke docker-remote-watcher docker-remote-watcher_info docker-remote-childchain

###
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "2.3"
services:
elixir-omg:
image: omisegoimages/elixir-omg-builder:stable-20200407
image: omisegoimages/elixir-omg-builder:stable-20200410
environment:
DATABASE_URL: postgres://omisego_dev:omisego_dev@postgres:5432/omisego_dev
volumes:
Expand Down Expand Up @@ -43,4 +43,4 @@ services:
- "2003-2004:2003-2004"
- "2023-2024:2023-2024"
- "8125:8125/udp"
- "8126:8126/tcp"
- "8126:8126/tcp"
6 changes: 3 additions & 3 deletions snapshots.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_20=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-stable-20200407-MIN_EXIT_PERIOD-20-PLASMA_CONTRACTS_SHA-a69c763f239b81c5eb46b0bbdef3459f764360dc.tar.gz
SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-stable-20200407-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA-a69c763f239b81c5eb46b0bbdef3459f764360dc.tar.gz
SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_240=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-stable-20200407-MIN_EXIT_PERIOD-240-PLASMA_CONTRACTS_SHA-a69c763f239b81c5eb46b0bbdef3459f764360dc.tar.gz
SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_20=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-stable-20200410-MIN_EXIT_PERIOD-20-PLASMA_CONTRACTS_SHA-a69c763f239b81c5eb46b0bbdef3459f764360dc.tar.gz
SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_120=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-stable-20200410-MIN_EXIT_PERIOD-120-PLASMA_CONTRACTS_SHA-a69c763f239b81c5eb46b0bbdef3459f764360dc.tar.gz
SNAPSHOT_MIX_EXIT_PERIOD_SECONDS_240=https://storage.googleapis.com/circleci-docker-artifacts/data-elixir-omg-tester-plasma-deployer-stable-20200410-MIN_EXIT_PERIOD-240-PLASMA_CONTRACTS_SHA-a69c763f239b81c5eb46b0bbdef3459f764360dc.tar.gz
CONTRACT_SHA=a69c763f239b81c5eb46b0bbdef3459f764360dc