diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ae0a7de93ddc4617a304e8d8cc6dbdeb45004e5..9b09b14e7f6cf4f3b4bde6488fc6d4271a7f10d8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,14 +1,17 @@ image: docker:19.03.1 + variables: DOCKER_TLS_CERTDIR: "/certs" IMAGE_TAG: $CI_REGISTRY_IMAGE:latest + services: - docker:19.03.1-dind + before_script: - - docker info + - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + build: stage: build script: - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker build -t $IMAGE_TAG . - docker push $IMAGE_TAG diff --git a/Dockerfile b/Dockerfile index 05b2ecab399014603e93bf3cdfb969fdd99c1e1a..16ec60124e212874e21d7aa22d615db851eb1126 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,7 @@ -FROM alpine:3.10 - -COPY cpanfile / -ENV EV_EXTRA_DEFS -DEV_NO_ATFORK - -RUN apk update && \ - apk add perl perl-io-socket-ssl perl-dev perl-json perl-yaml wget curl make && \ - curl -L https://cpanmin.us | perl - App::cpanminus && \ - cpanm --installdeps . -M https://cpan.metacpan.org && \ - apk del perl-dev g++ make wget curl && \ - rm -rf /root/.cpanm/* /usr/local/share/man/* /cpanfile +FROM docker-registry.pirati.cz/ramaseuski/docker-mojolicious ADD . /opt/rvvote EXPOSE 3000 - WORKDIR /opt/rvvote CMD ./script/rvvote daemon diff --git a/cpanfile b/cpanfile deleted file mode 100644 index 09671ecb2c3c6af99e173bb4c23731d887d5eded..0000000000000000000000000000000000000000 --- a/cpanfile +++ /dev/null @@ -1 +0,0 @@ -requires "Mojolicious";