Merge pull request #509 from UniversityOfHelsinkiCS/trunk

minor updates
UniversityOfHelsinkiCS · Aug 7, 2018 · a4785eb · a4785eb
2 parents 3f6dd66 + e9804ab
commit a4785eb
Show file tree

Hide file tree

Showing 8 changed files with 1,662 additions and 1,034 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,4 +10,4 @@ I have:
 - [ ] documented the code or added documentation to the wiki.
 - [ ] added or modified test(s).
 - [ ] test(s) that actually pass.
-- [ ] works in dev branch <!-- remove this line if your PR is not against master -->
+- [ ] works in trunk branch <!-- remove this line if your PR is not against master -->
diff --git a/.travis.yml b/.travis.yml
@@ -7,8 +7,6 @@ cache:
 
 notifications:
   email: false
-  slack:
-    secure: otVal+5p4efIi1Ms8lWV64WrAJN22cBjYy/ZLL7ufzoup3ibEcyxuDRDh/0iyUU8BVbyXTJSZsnSPjQHjmCAh0l+BaXAXmr+fMIYXbYr98uPSNReWCadWiDyW2+hbDylz845d6qX0qaMQ0OVc4QPwcanI42h5qTfTjcPc/1PkpIxoNWJM/wcEbdiXk66vOBagkZD46aRxehvAi8f+EEcMNUb5k2BoZDMb/pVKGSRRGHO9uJ1sYzxgFQKmDHgRores/UAfUOr0xnU8X9k3FZ2VqKgxjaLtMiqHDiABUtQblEEXEKspjifonMxc974hgkQwWQ/PvKZhnzatPLKTLjL5tcMXfGxfnznJpIRUBm17H5aGRt8cR/ba9SlCzGKQu5WLXZ+VE6acXgdFjhmkvmp+ESBjZ312F9hKmy2/A8VKJMpZs2W9Nu05HB+1+l6fLkQNCFkCzhAg9xA1aaihyNdPCd6GDarqE26YGL5auN4n/tlajLxUAEN2GxixxRk4e17PFor24xe8tYbp5X1knFFVSiQcUKpItJooDDqBFEkDy7uDk1Tyc4w1/mClQX2gwwUnPmVKeJ4e7E30/4iZsR4xlI8OSL4mc2DIbo4GslGFaf0Bmexku68qJHL0gegw8XNtNr2L+JG0zVbre0r6r0uvrue3tptohPTVKyGngFAq5g=
 language: node_js
 node_js:
 - '8'

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8-wheezy
+FROM node:8
 ADD ./labtool2.0 /code
 WORKDIR /code
 COPY ./labtool2.0/package.json ../

diff --git a/backend/Dockerfile b/backend/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:8-wheezy
+FROM node:8
 ADD ./ /code
 WORKDIR /code
 COPY ./package.json ./