CERBERUS/outline-server
1
0
Fork 0
mirror of https://github.com/OutlineFoundation/outline-server.git synced 2026-08-27 03:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into fortuna-dev-gallery-app

Browse source
This commit is contained in:
Vinicius Fortuna 2020-05-08 16:28:03 -04:00
commit 5ba8b2a5d6
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server_manager/base.webpack.js
View file

@ -28,19 +28,14 @@ exports.makeConfig = (options) => {
require.resolve('@webcomponents/webcomponentsjs/webcomponents-loader.js'),
path.resolve(__dirname, './web_app/ui_components/style.css'),
options.main,
// path.resolve(__dirname, './web_app/main.ts'),
],
target: options.target,
devtool: 'inline-source-map',
// Run the dev server with `yarn workspace outline-manager run webpack-dev-server --open`
devServer: {
// contentBase: OUTPUT_BASE,
overlay: true,
},
output: {
path: OUTPUT_BASE,
filename: 'main.js'
},
output: {path: OUTPUT_BASE, filename: 'main.js'},
module: {
rules: [
{
@ -73,6 +68,9 @@ exports.makeConfig = (options) => {
// Statically link the Roboto font, rather than link to fonts.googleapis.com
'window.polymerSkipLoadingFontRoboto': JSON.stringify(true),
}),
// @sentry/electron depends on electron code, even though it's never activated
// in the browser. Webpack still tries to build it, but fails with missing APIs.
// The IgnorePlugin prevents the compilation of the electron dependency.
new webpack.IgnorePlugin(/^electron$/),
new CopyPlugin(
[

13
src/shadowbox/docker/Dockerfile
View file

@ -12,14 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# See versions at https://hub.docker.com/_/node/
FROM node:8.15.0-alpine
# Newer node images have no valid content trust data.
# Pin the image node:12.16.3-alpine (linux/amd64) by hash.
# See versions at https://hub.docker.com/_/node?tab=tags&name=alpine
FROM node@sha256:12b2154fb459fa5f42c54771524609db041e7ef3465935d0ca82940d2d72669d
# Versions can be found at https://github.com/Jigsaw-Code/outline-ss-server/releases
ARG SS_VERSION=1.1.0
# Save metadata on the software versions we are using.
LABEL shadowbox.node_version=8.15.0
LABEL shadowbox.node_version=12.16.3
LABEL shadowbox.outline-ss-server_version="${SS_VERSION}"
ARG GITHUB_RELEASE
@ -40,9 +42,8 @@ RUN mkdir bin && curl -SsL https://github.com/Jigsaw-Code/outline-ss-server/rele
COPY third_party/prometheus/prometheus ./bin/
COPY src/shadowbox/package.json .
COPY yarn.lock .
# TODO: Replace with plain old "yarn" once the base image is fixed:
# https://github.com/nodejs/docker-node/pull/639
RUN /opt/yarn-v$YARN_VERSION/bin/yarn install --prod
RUN yarn install --prod
# Install management service
COPY build/shadowbox/app app/