diff --git a/Dockerfile.releasing b/Dockerfile.releasing deleted file mode 100644 index 637a5a9ff..000000000 --- a/Dockerfile.releasing +++ /dev/null @@ -1,18 +0,0 @@ -FROM electronuserland/builder:8 - -# This got copied from https://github.com/electron-userland/electron-builder/blob/master/docker/wine/Dockerfile -# See https://github.com/electron-userland/electron-builder/issues/2531 - -RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common && dpkg --add-architecture i386 && curl -L https://dl.winehq.org/wine-builds/Release.key > Release.key && apt-key add Release.key && apt-add-repository https://dl.winehq.org/wine-builds/ubuntu && \ - apt-get update && \ - apt-get -y remove software-properties-common libdbus-glib-1-2 python3-dbus python3-gi python3-pycurl python3-software-properties && \ - apt-get install -y --no-install-recommends winehq-stable && \ - # Install a dependency used by keytar - apt-get -qq install -y libsecret-1-dev && \ - # clean - apt-get clean && rm -rf /var/lib/apt/lists/* && unlink Release.key - -RUN curl -L https://github.com/electron-userland/electron-builder-binaries/releases/download/wine-2.0.3-mac-10.13/wine-home.zip > /tmp/wine-home.zip && unzip /tmp/wine-home.zip -d /root/.wine && unlink /tmp/wine-home.zip - -ENV WINEDEBUG -all,err+all -ENV WINEDLLOVERRIDES winemenubuilder.exe=d diff --git a/Dockerfile.testing b/Dockerfile.testing index 2aa1798dc..ffeaa069c 100644 --- a/Dockerfile.testing +++ b/Dockerfile.testing @@ -1,31 +1,4 @@ -FROM electronuserland/builder:8 - -# This got copied from https://github.com/electron-userland/electron-builder/blob/master/docker/wine/Dockerfile -# See https://github.com/electron-userland/electron-builder/issues/2531 - -RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common && dpkg --add-architecture i386 && curl -L https://dl.winehq.org/wine-builds/Release.key > Release.key && apt-key add Release.key && apt-add-repository https://dl.winehq.org/wine-builds/ubuntu && \ - apt-get update && \ - apt-get -y remove software-properties-common libdbus-glib-1-2 python3-dbus python3-gi python3-pycurl python3-software-properties && \ - apt-get install -y --no-install-recommends winehq-stable && \ - # Next three lines are copied from https://github.com/electron-userland/electron-builder/blob/master/docker/wine-chrome/Dockerfile - 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 -y && apt-get install -y --no-install-recommends xvfb google-chrome-stable && \ - # Install display server dependencies (see https://github.com/electron/spectron/issues/144#issuecomment-270778659) - apt-get install -y xvfb libxtst6 libxss1 libgtk2.0-0 && \ - # Install core libraries for chromium driver (see https://github.com/electron/spectron/issues/144#issuecomment-270778659) - apt-get install -y libnss3 libasound2 libgconf-2-4 && \ - # Install a dependency used by keytar - apt-get -qq install -y libsecret-1-dev && \ - # clean - apt-get clean && rm -rf /var/lib/apt/lists/* && unlink Release.key - -RUN curl -L https://github.com/electron-userland/electron-builder-binaries/releases/download/wine-2.0.3-mac-10.13/wine-home.zip > /tmp/wine-home.zip && unzip /tmp/wine-home.zip -d /root/.wine && unlink /tmp/wine-home.zip - -ENV WINEDEBUG -all,err+all -ENV WINEDLLOVERRIDES winemenubuilder.exe=d - -# The next few lines are the only commands special to our Dockerfile +FROM electronuserland/builder:wine-chrome ADD package.json /tmp/ ADD package-lock.json /tmp/ diff --git a/RELEASENOTES.md b/RELEASENOTES.md index c8aa0b072..3aee6836a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -7,4 +7,4 @@ - None ## Internals -- None +- Fixed the Dockerfile used when testing PRs. ([#1057](https://github.com/realm/realm-studio/pull/1057)) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 729574b18..5e931bc49 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -146,13 +146,3 @@ See the section on [releasing](./RELEASING.md). - `npm run check:auto-update-files` runs ./scripts/check-auto-update-files.js to check if the auto updating `latest-*` files are referring to the current version from the package.json and ensuring that it's not referencing any files that won't be available once released. - `npm run generate-all-types-realm` runs ./scripts/generate-realm.js to generate a test realm with objects following the schema-exporters all-types schema. - `npm run sentry:upload-symbols` downloads electron and uploads symbols to the Sentry error catching service, run this whenever the Electron version is changed. -- `./scripts/via-nvm.sh` installs node and npm in the version from `.nvmrc` and runs commands with that enabled, ex: - - ./scripts/via-nvm.sh node --version - - outputs - - Found '/Users/kraenhansen/Repositories/realm-studio/.nvmrc' with version - v8.6.0 is already installed. - Now using node v8.6.0 (npm v5.3.0) - v8.6.0 diff --git a/scripts/package-for-linux-windows-inside.sh b/scripts/package-for-linux-windows-inside.sh deleted file mode 100755 index 78cdc5470..000000000 --- a/scripts/package-for-linux-windows-inside.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash - -# Exit on error -set -e - -# Install dependencies -npm install - -# Install native dependencies for windows -./node_modules/.bin/electron-builder install-app-deps --platform win32 - -# Build the app -npm run build - -# Package the app for windows and linux -./node_modules/.bin/electron-builder --dir --linux --windows --publish never diff --git a/scripts/package-for-linux-windows.sh b/scripts/package-for-linux-windows.sh deleted file mode 100755 index 63e0f88ce..000000000 --- a/scripts/package-for-linux-windows.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# This will be a docker volume -NODE_MODULES_PATH=realm-studio-node-modules - -# Build the image -docker build \ - -t realm-studio-packaging \ - -f $DIR/../Dockerfile.releasing \ - . - -# Run the release package -docker run --rm -t \ - --env ELECTRON_CACHE="/root/.cache/electron" \ - --env ELECTRON_BUILDER_CACHE="/root/.cache/electron-builder" \ - -v ~/.cache/electron:/root/.cache/electron \ - -v ~/.cache/electron-builder:/root/.cache/electron-builder \ - -v $DIR/..:/project \ - -v $NODE_MODULES_PATH:/project/node_modules \ - realm-studio-packaging \ - /project/scripts/package-for-linux-windows-inside.sh diff --git a/scripts/via-nvm.sh b/scripts/via-nvm.sh deleted file mode 100755 index ee313f7b0..000000000 --- a/scripts/via-nvm.sh +++ /dev/null @@ -1,15 +0,0 @@ -if [[ -z "${NVM_DIR}" ]]; then - echo "ERROR: Expected a NVM_DIR environment variable" - exit 1 -fi - -if [[ -s "$NVM_DIR/nvm.sh" ]]; then - source "$NVM_DIR/nvm.sh" # This loads nvm - # Install an use the version from .nvmrx - nvm install - # Execute the command passed - exec $@ -else - echo "ERROR: Expected a nvm.sh script in '$NVM_DIR'" - exit 2 -fi