Skip to content
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
10 changes: 4 additions & 6 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["config:base", ":disableDependencyDashboard", ":semanticCommits", ":semanticCommitTypeAll(chore)", "helpers:pinGitHubActionDigests"],
"extends": ["config:base", ":disableDependencyDashboard", ":semanticCommits", ":semanticCommitTypeAll(chore)", "helpers:pinGitHubActionDigests", "docker:enableMajor"],
"labels": ["dependencies"],
"prConcurrentLimit": 0,
"rangeStrategy": "bump",
Expand All @@ -15,14 +15,12 @@
"groupSlug": "all-minor-patch"
},
{
"matchManagers": ["npm", "dockerfile"],
"matchPackageNames": ["madnificent/ember", "ember-cli", "ember-data", "ember-source"],
"groupName": "Ember.js",
"matchPackageNames": ["ember-data", "ember-source"],
"groupName": "ember.js",
"groupSlug": "ember",
"rangeStrategy": "replace",
"draftPR": true,
"separateMinorPatch": true,
"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}}"]
"separateMinorPatch": true
},
{
"matchManagers": ["npm"],
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
- name: Build test image
uses: guidojw/actions/build-docker-image@2b1dea8cbd9e44491c269e771b75636026caf8ca # renovate: tag=v1.1.0
with:
file: Dockerfile.test
file: Dockerfile
target: base
name: app

lint:
Expand Down Expand Up @@ -71,4 +72,4 @@ jobs:

- name: Test
run: |
docker run -t app yarn test
docker run -e CI=true -t app yarn test
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM madnificent/ember:3.17.0 as ember
FROM danlynn/ember-cli:3.28.2@sha256:fe88d8ecf88086b77ef9a21b5ce523c8f1ae5402df5e25632bd3390be92a75a7 AS base

ARG DEPLOY_TARGET='production'
ARG BUILD_HASH='unknown'
Expand All @@ -9,12 +9,16 @@ COPY .yarn .yarn
RUN yarn install --immutable

COPY . .


FROM base AS builder

RUN DEPLOY_TARGET=$DEPLOY_TARGET BUILD_HASH=$BUILD_HASH ember build --environment=production


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

RUN rm /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/conf.d/app.conf
COPY --from=ember /opt/app/dist /usr/share/nginx/html
COPY --from=builder /opt/app/dist /usr/share/nginx/html
19 changes: 0 additions & 19 deletions Dockerfile.test

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"ember-auto-import": "^2.2.4",
"ember-bootstrap": "^4.4",
"ember-can": "^4.1",
"ember-cli": "~3.20.2",
"ember-cli": "^3.28.4",
"ember-cli-babel": "^7.26.6",
"ember-cli-content-security-policy": "^2.0.1",
"ember-cli-dependency-checker": "^3.2",
Expand Down
Loading