Skip to content

Commit

Permalink
use only base image
Browse files Browse the repository at this point in the history
  • Loading branch information
mroz22 authored and vladimirvolek committed Nov 5, 2019
1 parent cf80f7e commit ff2246f
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 62 deletions.
40 changes: 38 additions & 2 deletions ci/docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,41 @@
FROM node:lts
FROM node:10

RUN apt-get update
RUN apt-get install -y build-essential
RUN apt-get install xvfb libgtk2.0-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 --assume-yes
RUN apt-get install xvfb libgtk2.0-0 libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 --assume-yes

USER root

RUN node --version

# install Chromebrowser
RUN \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list && \
apt-get update && \
apt-get install -y dbus-x11 google-chrome-stable google-chrome-beta && \
rm -rf /var/lib/apt/lists/*

# "fake" dbus address to prevent errors
# https://github.com/SeleniumHQ/docker-selenium/issues/87
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null

# Add zip utility - it comes in very handy
RUN apt-get update && apt-get install -y zip

# versions of local tools
RUN node -v
RUN npm -v
RUN yarn -v
RUN google-chrome --version
RUN google-chrome-beta --version
RUN zip --version
RUN git --version

# a few environment variables to make NPM installs easier
# good colors for most applications
ENV TERM xterm
# avoid million NPM install messages
ENV npm_config_loglevel warn
# allow installing when the main user is root
ENV npm_config_unsafe_perm true
42 changes: 0 additions & 42 deletions ci/docker/cypress/Dockerfile

This file was deleted.

19 changes: 1 addition & 18 deletions ci/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,4 @@ build & push image:
- docker pull $CONTAINER_NAME:latest || true
- docker build --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest ./ci/docker/base
- docker push $CONTAINER_NAME:$CI_COMMIT_SHA
- docker push $CONTAINER_NAME:latest

build & push image-cypress:
stage: setup environment
when: manual
before_script:
- docker login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
variables:
DOCKER_TLS_CERTDIR: ''
CONTAINER_NAME: "$CI_REGISTRY/satoshilabs/trezor/trezor-suite/cypress"
image: docker
services:
- docker:dind
script:
- docker pull $CONTAINER_NAME:latest || true
- docker build --tag $CONTAINER_NAME:$CI_COMMIT_SHA --tag $CONTAINER_NAME:latest ./ci/docker/cypress
- docker push $CONTAINER_NAME:$CI_COMMIT_SHA
- docker push $CONTAINER_NAME:latest
- docker push $CONTAINER_NAME:latest

0 comments on commit ff2246f

Please sign in to comment.