Changing to Ubuntu and docker-compose v2. Closes #185

selenium-screenshot-testing
Kevin Chung 2017-01-06 17:04:57 -05:00
parent 6eee636893
commit 09398b2ab0
2 changed files with 27 additions and 29 deletions

View File

@ -1,8 +1,11 @@
FROM alpine:3.2 FROM ubuntu:latest
RUN apk update && apk upgrade RUN apt-get update -y
RUN apk add git gcc musl-dev libffi-dev python python-dev py-pip RUN apt-get upgrade -y
RUN apt-get install build-essential python-dev python-pip libffi-dev -y
RUN mkdir /opt VOLUME ["/opt/CTFd"]
RUN mkdir -p /opt/CTFd
COPY . /opt/CTFd COPY . /opt/CTFd
WORKDIR /opt/CTFd WORKDIR /opt/CTFd

View File

@ -1,3 +1,6 @@
version: '2'
services:
ctfd: ctfd:
build: . build: .
restart: always restart: always
@ -5,8 +8,8 @@ ctfd:
- "8000:8000" - "8000:8000"
environment: environment:
- DATABASE_URL=mysql+pymysql://root@db/ctfd - DATABASE_URL=mysql+pymysql://root@db/ctfd
volumes_from: volumes:
- data:rw - .data/CTFd/logs:/opt/CTFd/CTFd/logs
links: links:
- db:db - db:db
@ -14,13 +17,5 @@ db:
image: mysql image: mysql
environment: environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes - MYSQL_ALLOW_EMPTY_PASSWORD=yes
volumes_from:
- data:rw
data:
image: mysql
restart: always
volumes: volumes:
- /var/lib/mysql - .data/mysql:/var/lib/mysql
- /opt/CTFd/CTFd/logs
command: "tail -f /dev/null"