From 41b22c2527e0dfe624706b8f3d61113f4127fce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrej=20Rama=C5=A1euski?= <andrej@x2.cz>
Date: Tue, 19 Jan 2021 21:13:54 +0100
Subject: [PATCH] Pridan yamdi
---
.gitlab-ci.yml | 15 +++++++--------
Dockerfile | 3 +++
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcfb00e..2d2a7e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,11 @@
-image: docker:19.03.1
+image: docker:19.03.12
variables:
DOCKER_TLS_CERTDIR: "/certs"
- IMAGE_TAG: $CI_REGISTRY_IMAGE
- IMAGE_VER: 1.5.1
+ IMAGE_VER: 1.6.0
services:
- - docker:19.03.1-dind
+ - docker:19.03.12-dind
before_script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -14,7 +13,7 @@ before_script:
build:
stage: build
script:
- - docker build -t $IMAGE_TAG:$IMAGE_VER .
- - docker tag $IMAGE_TAG:$IMAGE_VER $IMAGE_TAG:latest
- - docker push $IMAGE_TAG:$IMAGE_VER
- - docker push $IMAGE_TAG:latest
+ - docker pull $CI_REGISTRY_IMAGE:latest || true
+ - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$IMAGE_VER --tag $CI_REGISTRY_IMAGE:latest .
+ - docker push $CI_REGISTRY_IMAGE:$IMAGE_VER
+ - docker push $CI_REGISTRY_IMAGE:latest
diff --git a/Dockerfile b/Dockerfile
index 64941fe..4cc0a63 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ RUN apt-get update && apt-get install -y \
wget \
cpanminus \
python \
+ yamdi \
build-essential \
libxml2-dev \
libcrypt-openssl-rsa-perl \
@@ -21,6 +22,7 @@ RUN apt-get update && apt-get install -y \
RUN cpanm \
Data::Random \
DBIx::Class \
+ Media::Info \
Mojolicious \
Mojo::Pg \
Mojo::JWT \
@@ -37,3 +39,4 @@ RUN npm update && npm install && npm run build && rm -rf mode_modules
USER nobody
EXPOSE 3000
CMD hypnotoad -f /opt/PiTube/script/pitube
+#CMD /opt/PiTube/script/pitube daemon
--
GitLab