From a35d80124ac41ca559422facb4178102ccccb100 Mon Sep 17 00:00:00 2001 From: Armin Friedl Date: Mon, 31 Aug 2020 20:51:57 +0200 Subject: [PATCH] Build separate dirl binary --- .drone.yml | 12 +++++++----- Dockerfile | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 818c7be..f1c9be7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ kind: pipeline type: docker -name: default +name: dirl steps: - name: build @@ -11,13 +11,15 @@ steps: - cd suckless-quark - git checkout dirlist - make + - mv quark quark-dirl -- name: publish-quark +- name: publish-dirl image: appleboy/drone-scp settings: host: friedl.net - target: /var/services/dirlist/repo/bin/suckless - source: suckless-quark/quark + target: /var/services/dirlist/repo/bin/suckless/quark + source: suckless-quark/quark-dirl + strip_components: 1 username: from_secret: ssh_username password: @@ -33,4 +35,4 @@ steps: dockerfile: Dockerfile purge: true repo: arminfriedl/quark - tags: latest + tags: dirl diff --git a/Dockerfile b/Dockerfile index ec2a6bb..1012115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,6 @@ RUN adduser web --disabled-password --no-create-home --shell /sbin/nologin && \ addgroup web web && \ mkdir -p /var/www/html -COPY suckless-quark/quark /usr/local/bin +COPY suckless-quark/quark-dirl /usr/local/bin -ENTRYPOINT ["quark", "-p", "80", "-u", "web", "-g", "web", "-n", "4096", "-h", "0.0.0.0", "-l", "-d", "/var/www/html"] +ENTRYPOINT ["quark-dirl", "-p", "80", "-u", "web", "-g", "web", "-n", "4096", "-h", "0.0.0.0", "-l", "-d", "/var/www/html"]