Skip to content

Commit ed284f0

Browse files
felixgablerjoeldomke
authored andcommitted
WIP: update toolkit docker images
- MaxMind GeoIP databases need to be downloaded differently https://dev.maxmind.com/geoip/geoip-direct-downloads/
1 parent bb951a5 commit ed284f0

5 files changed

Lines changed: 6 additions & 11 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Toolkit-Docker
2-
Dockerfiles for the toolkit's docker images. They should be built automatically by DockerCloud.
2+
Dockerfiles for the toolkit's docker images. They should be built automatically by DockerHub.
33

44
(be careful with line endings when building the containers. ALways use Unix LF)

backend/Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM hseeberger/scala-sbt:8u212_2.13.0_1.2.8
1+
FROM hseeberger/scala-sbt:8u252_1.3.13_2.12.11
22

33
LABEL maintainer="fgabler@tue.mpg.de"
44

@@ -47,11 +47,6 @@ RUN git clone https://github.com/felixgabler/maxmind-geoip2-scala.git && \
4747
cd maxmind-geoip2-scala && \
4848
sbt publishLocal
4949

50-
# Install custom scalajs mithril
51-
RUN git clone https://github.com/zy4/scalajs-mithril.git && \
52-
cd scalajs-mithril && \
53-
sbt publishLocal
54-
5550
# Download maxmind geoip data
5651
RUN curl -fsL http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.mmdb.gz | gunzip -c > $MAXMIND_DB
5752

backend/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Dockerfile for the toolkit's backend docker image. It should be built automatically by DockerCloud.
33

44
To build it manually, run:
5-
``docker image build -t "proteinevolution/toolkit-docker:1.2.0" -t "proteinevolution/toolkit-docker:latest" .``
5+
``docker image build -t "proteinevolution/toolkit-docker:1.3.0" -t "proteinevolution/toolkit-docker:latest" .``
66

77
To push the image, run:
88
``docker push proteinevolution/toolkit-docker:latest``

frontend/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM node:10.16
1+
FROM node:14.7
22

33
LABEL maintainer="fgabler@tue.mpg.de"
44

5-
RUN yarn global add yarn@1.16.0
5+
RUN yarn global add yarn@1.22.4
66
RUN yarn global add @vue/cli npm-check-updates
77

88
ENV CHOKIDAR_USEPOLLING=true

frontend/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Dockerfile for the toolkit's frontend docker image. It should be built automatically by DockerCloud.
33

44
To build it manually, run:\
5-
``docker image build -t "proteinevolution/toolkit-docker-frontend:1.2.0" -t "proteinevolution/toolkit-docker-frontend:latest" .``
5+
``docker image build -t "proteinevolution/toolkit-docker-frontend:1.3.0" -t "proteinevolution/toolkit-docker-frontend:latest" .``
66

77
To push the image, run:\
88
``docker push proteinevolution/toolkit-docker-frontend:latest``

0 commit comments

Comments
 (0)