Skip to content
Merged
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: 1 addition & 1 deletion factory/.env
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ NODE_VERSION="${FACTORY_DEFAULT_NODE_VERSION}"

# Update the FACTORY_VERSION to deploy cypress/factory if you make changes to
# BASE_IMAGE, FACTORY_DEFAULT_NODE_VERSION, YARN_VERSION, factory.Dockerfile or installScripts
FACTORY_VERSION='5.11.5'
FACTORY_VERSION='5.11.6'

# Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
# Linux/amd64 only
Expand Down
4 changes: 4 additions & 0 deletions factory/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change log

## 5.11.6

- Failed installs of Cypress no longer get cached as a docker layer. Addressed in [#1390](https://github.com/cypress-io/cypress-docker-images/pull/1390)

## 5.11.5

- When importing PGP keys for Node.js, allow individual key imports to fail. Log an error and continue to build. Resolves an issue when there is a network connectivity problem to the fallback keyserver keyserver.ubuntu.com. Addressed in [#1385](https://github.com/cypress-io/cypress-docker-images/issues/1385).
Expand Down
3 changes: 1 addition & 2 deletions factory/factory.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ ONBUILD ARG CYPRESS_VERSION
# This is only set if the cypress version is passed in (thats what the + syntax stuff does.)
ONBUILD ENV NODE_PATH=${CYPRESS_VERSION:+/usr/local/lib/node_modules}

ONBUILD RUN node /opt/installScripts/cypress/install-cypress-version.js ${CYPRESS_VERSION}

ONBUILD RUN /opt/installScripts/cypress/install.sh ${CYPRESS_VERSION}
# Global Cleanup
ONBUILD RUN apt-get purge -y --auto-remove \
curl \
Expand Down
13 changes: 0 additions & 13 deletions factory/installScripts/cypress/default.sh

This file was deleted.

24 changes: 0 additions & 24 deletions factory/installScripts/cypress/install-cypress-version.js

This file was deleted.

17 changes: 17 additions & 0 deletions factory/installScripts/cypress/install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#! /bin/bash
set -e
# TODO: should typescript be versioned? Should it have it's own ARG for the factory?
# Typescript is installed to allow testing of .ts spec files.
if [[ -n "$1" ]]; then
npm install -g "cypress@$1" typescript

# Loosen file priveleges for the cypress cache. The first time that cypress runs it will create a
# binary_state.json file if it hasn't already been created. This was causing issues with non-root
# users, they do not have access to write to this directory. Since this is a develompent docker container
# and to lower barriers as much as possible, we are loosening privs to allow the binary_state.json file
# to be created. Previously this file was created by root when cypress verify was called, but this would
# apply to amd processors since cypress verify was not called on arm processors.
chmod -R 777 /root/.cache
else
echo 'No Cypress version provided; skipping install.'
fi