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.

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

Updated the Dockerfile #1057

Merged
merged 5 commits into from
Dec 28, 2018
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
18 changes: 0 additions & 18 deletions Dockerfile.releasing

This file was deleted.

29 changes: 1 addition & 28 deletions Dockerfile.testing
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
- None

## Internals
- None
- Fixed the Dockerfile used when testing PRs. ([#1057](https://github.com/realm/realm-studio/pull/1057))
10 changes: 0 additions & 10 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>
v8.6.0 is already installed.
Now using node v8.6.0 (npm v5.3.0)
v8.6.0
16 changes: 0 additions & 16 deletions scripts/package-for-linux-windows-inside.sh

This file was deleted.

22 changes: 0 additions & 22 deletions scripts/package-for-linux-windows.sh

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/via-nvm.sh

This file was deleted.