From ae2acb595f9c395a12e934b971319765164f544b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@sedlistka.cz>
Date: Fri, 8 Nov 2019 21:26:59 +0100
Subject: [PATCH] Aktualizace buildu
---
.gitlab-ci.yml | 7 +++++--
Dockerfile | 13 +------------
cpanfile | 1 -
3 files changed, 6 insertions(+), 15 deletions(-)
delete mode 100644 cpanfile
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ae0a7d..9b09b14 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 05b2eca..16ec601 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 09671ec..0000000
--- a/cpanfile
+++ /dev/null
@@ -1 +0,0 @@
-requires "Mojolicious";
--
GitLab