Skip to content

Commit dcdc08e

Browse files
feat: new Dockerfile base image (#412)
Co-authored-by: Matteo Bronkhorst <[email protected]>
1 parent 429eb88 commit dcdc08e

File tree

6 files changed

+401
-688
lines changed

6 files changed

+401
-688
lines changed

.github/renovate.json

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": ["config:base", ":disableDependencyDashboard", ":semanticCommits", ":semanticCommitTypeAll(chore)", "helpers:pinGitHubActionDigests"],
2+
"extends": ["config:base", ":disableDependencyDashboard", ":semanticCommits", ":semanticCommitTypeAll(chore)", "helpers:pinGitHubActionDigests", "docker:enableMajor"],
33
"labels": ["dependencies"],
44
"prConcurrentLimit": 0,
55
"rangeStrategy": "bump",
@@ -15,14 +15,12 @@
1515
"groupSlug": "all-minor-patch"
1616
},
1717
{
18-
"matchManagers": ["npm", "dockerfile"],
19-
"matchPackageNames": ["madnificent/ember", "ember-cli", "ember-data", "ember-source"],
20-
"groupName": "Ember.js",
18+
"matchPackageNames": ["ember-data", "ember-source"],
19+
"groupName": "ember.js",
2120
"groupSlug": "ember",
2221
"rangeStrategy": "replace",
2322
"draftPR": true,
24-
"separateMinorPatch": true,
25-
"prBodyNotes": ["{{#unless isPatch}}:warning: Check https://github.com/ember-cli/ember-cli/blob/master/docs/node-support.md if this version comes with new Node.js compatibility and change the Node.js version in `.nvmrc` if so. :warning:{{/unless}}"]
23+
"separateMinorPatch": true
2624
},
2725
{
2826
"matchManagers": ["npm"],

.github/workflows/continuous-integration.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ jobs:
2323
- name: Build test image
2424
uses: guidojw/actions/build-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # renovate: tag=v1.1.0
2525
with:
26-
file: Dockerfile.test
26+
file: Dockerfile
27+
target: base
2728
name: app
2829

2930
lint:
@@ -71,4 +72,4 @@ jobs:
7172

7273
- name: Test
7374
run: |
74-
docker run -t app yarn test
75+
docker run -e CI=true -t app yarn test

Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM madnificent/ember:3.17.0 as ember
1+
FROM danlynn/ember-cli:3.28.2@sha256:fe88d8ecf88086b77ef9a21b5ce523c8f1ae5402df5e25632bd3390be92a75a7 AS base
22

33
ARG DEPLOY_TARGET='production'
44
ARG BUILD_HASH='unknown'
@@ -9,12 +9,16 @@ COPY .yarn .yarn
99
RUN yarn install --immutable
1010

1111
COPY . .
12+
13+
14+
FROM base AS builder
15+
1216
RUN DEPLOY_TARGET=$DEPLOY_TARGET BUILD_HASH=$BUILD_HASH ember build --environment=production
1317

1418

15-
FROM nginx:1.21-alpine
19+
FROM nginx:1.21.4-alpine@sha256:12aa12ec4a8ca049537dd486044b966b0ba6cd8890c4c900ccb5e7e630e03df0
1620
LABEL maintainer="C.S.V. Alpha <[email protected]>"
1721

1822
RUN rm /etc/nginx/conf.d/default.conf
1923
COPY nginx.conf /etc/nginx/conf.d/app.conf
20-
COPY --from=ember /opt/app/dist /usr/share/nginx/html
24+
COPY --from=builder /opt/app/dist /usr/share/nginx/html

Dockerfile.test

Lines changed: 0 additions & 19 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"ember-auto-import": "^2.2.4",
4040
"ember-bootstrap": "^4.4",
4141
"ember-can": "^4.1",
42-
"ember-cli": "~3.20.2",
42+
"ember-cli": "^3.28.4",
4343
"ember-cli-babel": "^7.26.6",
4444
"ember-cli-content-security-policy": "^2.0.1",
4545
"ember-cli-dependency-checker": "^3.2",

0 commit comments

Comments
 (0)