Merge pull request #634 from rwakulszowa/update-setup-steps

fix node version, update mysql lib name
watchdogpolska · May 24, 2019 · d91bf85 · d91bf85
2 parents c8773e0 + 6e5077b
commit d91bf85
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.contrib/docker/Dockerfile.gulp b/.contrib/docker/Dockerfile.gulp
@@ -1,4 +1,4 @@
-FROM node:latest
+FROM node:8
 WORKDIR /app
 VOLUME /app
 COPY .contrib/docker/docker-entrypoint.gulp.sh /docker-entrypoint.sh

diff --git a/.contrib/docker/Dockerfile.web b/.contrib/docker/Dockerfile.web
@@ -6,7 +6,7 @@ WORKDIR /code
 # Install python dependencies
 ENV PYTHONUNBUFFERED 1
 RUN apt-get update && apt-get install -y\
-    libmysqlclient-dev \
+    default-libmysqlclient-dev \
     gcc \
     build-essential \
     curl

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,6 +9,7 @@ services:
       - "3306"
     environment:
       MYSQL_ROOT_PASSWORD: "password"
+      MYSQL_DATABASE: "poradnia"
     healthcheck:
       test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
       timeout: 20s

diff --git a/docs/getting_up.rst b/docs/getting_up.rst
@@ -11,7 +11,8 @@ Obraz przygotowany dla środowiska Docker właściwy jest wyłącznie do pracy w
 
 Uruchomienie::
 
-    $ docker-compose --build up
+    $ docker-compose build
+    $ docker-compose up
 
 Po poprawnym uruchomieniu usług można przejść w przeglądarce pod adres ``http://localhost:8000``.