Skip to content

Commit

Permalink
wip: Refactor CI to use GitHub actions and generic bash scripts (#77)
Browse files Browse the repository at this point in the history
  • Loading branch information
claustres committed Apr 10, 2024
1 parent bc10f34 commit ae8065e
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 11 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ dist
electron/dist
node_modules
electron/node_modules
node_modules

4 changes: 2 additions & 2 deletions build/webpack.prod.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var webpackConfig = merge(baseWebpackConfig, {
})
]
})

/* FIXME: Uglify return an error
if (!process.env.DEBUG) {
webpackConfig.plugins.unshift(
new webpack.optimize.UglifyJsPlugin({
Expand All @@ -70,7 +70,7 @@ if (!process.env.DEBUG) {
})
)
}

*/
if (config.build.productionGzip) {
var CompressionWebpackPlugin = require('compression-webpack-plugin')

Expand Down
13 changes: 5 additions & 8 deletions dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
FROM weacast/weacast-api:dev
FROM node:16-bookworm AS Build

WORKDIR /opt/weacast/weacast-app
COPY . /opt/weacast/weacast-app
WORKDIR /opt/weacast

RUN yarn install
# Install already performs build
# RUN npm run build
RUN git clone https://github.com/weacast/weacast-app.git -b master --single-branch && cd weacast-app && yarn install && cd ..

RUN cp -R /opt/weacast/weacast-app/dist /opt/weacast/weacast-api
FROM weacast/weacast-api:dev

WORKDIR /opt/weacast/weacast-api
COPY --from=Build --chown=node:node /opt/weacast/weacast-app/dist /opt/weacast/weacast/packages/api/dist

0 comments on commit ae8065e

Please sign in to comment.