From dae1062ad0ab417884968fab40e5aaff1051e662 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Thu, 9 Jan 2020 13:33:05 +0100 Subject: [PATCH 1/2] Use node LTS in production --- backend/Dockerfile | 2 +- webapp/Dockerfile | 2 +- webapp/Dockerfile.maintenance | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 3dae08143..957bc6ab5 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.12.0-alpine as base +FROM node:lts-alpine as base LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)" EXPOSE 4000 diff --git a/webapp/Dockerfile b/webapp/Dockerfile index 29f7b2b13..c5025949b 100644 --- a/webapp/Dockerfile +++ b/webapp/Dockerfile @@ -1,4 +1,4 @@ -FROM node:13.6.0-alpine as base +FROM node:lts-alpine as base LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" EXPOSE 3000 diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance index ee0db908a..ca4ba37bc 100644 --- a/webapp/Dockerfile.maintenance +++ b/webapp/Dockerfile.maintenance @@ -1,4 +1,4 @@ -FROM node:13.6.0-alpine as build +FROM node:lts-alpine as build LABEL Description="Maintenance page of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" EXPOSE 3000 From b2db5e60570152b465ec66a3a778497aca0383aa Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Fri, 10 Jan 2020 10:35:12 +0100 Subject: [PATCH 2/2] Skip tests for DonationsInfo - the functionality it's testing has been suspended. If we add back that functionality, we should refactor the tests/stop skipping. - Or maybe we can remove them in a separate PR?? --- webapp/components/DonationInfo/DonationInfo.spec.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webapp/components/DonationInfo/DonationInfo.spec.js b/webapp/components/DonationInfo/DonationInfo.spec.js index c308e2146..307d997c4 100644 --- a/webapp/components/DonationInfo/DonationInfo.spec.js +++ b/webapp/components/DonationInfo/DonationInfo.spec.js @@ -37,7 +37,7 @@ describe('DonationInfo.vue', () => { ).toBe('donations.donate-now') }) - it('creates a title from the current month and a translation string', () => { + it.skip('creates a title from the current month and a translation string', () => { mocks.$t = jest.fn(() => 'Spenden für') expect(Wrapper().vm.title).toBe('Spenden für Dezember') }) @@ -49,7 +49,7 @@ describe('DonationInfo.vue', () => { }) describe('given german locale', () => { - it('creates a label from the given amounts and a translation string', () => { + it.skip('creates a label from the given amounts and a translation string', () => { expect(mocks.$t).toBeCalledWith( 'donations.amount-of-total', expect.objectContaining({ @@ -65,7 +65,7 @@ describe('DonationInfo.vue', () => { mocks.$i18n.locale = () => 'en' }) - it('creates a label from the given amounts and a translation string', () => { + it.skip('creates a label from the given amounts and a translation string', () => { expect(mocks.$t).toBeCalledWith( 'donations.amount-of-total', expect.objectContaining({