publish through drone

This commit is contained in:
Marvin Steadfast 2019-04-15 14:47:51 +02:00
parent 1049772a31
commit 111717d88a
6 changed files with 31 additions and 9 deletions

21
.drone.yml Normal file
View File

@ -0,0 +1,21 @@
kind: pipeline
name: default
steps:
- name: submodules
image: docker:git
commands:
- git submodule init
- git submodule update --recursive --remote
- name: build and upload
image: xsteadfastx/blog
environment:
FTP_PASS:
from_secret: ftp_pass
commands:
- sudo cp -a /drone/src/. /blog/
- sudo chown -R blog:blog /blog
- cd /blog
- make ftp_upload

4
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "pelican-plugins"]
path = pelican-plugins
url = git@github.com:xsteadfastx/pelican-plugins.git
url = https://github.com/xsteadfastx/pelican-plugins.git
[submodule "pelican-plugins-3rd/ipynb"]
path = pelican-plugins-3rd/ipynb
url = git://github.com/danielfrg/pelican-ipynb.git
url = https://github.com/danielfrg/pelican-ipynb.git

View File

@ -10,7 +10,7 @@ PUBLISHCONF=$(BASEDIR)/publishconf.py
FTP_HOST=xsteadfastx.org/
FTP_USER=xstead_0
FTP_PASS=`cat .ftp_pass.txt`
#FTP_PASS=`cat .ftp_pass.txt`
FTP_TARGET_DIR=/
SSH_HOST=localhost
@ -93,7 +93,7 @@ stopserver:
@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
publish:
$(DOCKER_COMPOSE_CMD) $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
ssh_upload: publish
scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
@ -105,7 +105,7 @@ dropbox_upload: publish
cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
ftp_upload: publish
$(DOCKER_COMPOSE_CMD) lftp ftp://$(FTP_USER):$(FTP_PASS)@$(FTP_HOST) -e "set ssl:verify-certificate no; mirror -R --ignore-time --no-perms --parallel=4 -e --use-cache -v $(OUTPUTDIR) $(FTP_TARGET_DIR); quit"
lftp ftp://$(FTP_USER):$(FTP_PASS)@$(FTP_HOST) -e "set ssl:verify-certificate no; mirror -R --ignore-time --no-perms --parallel=4 -e --use-cache -v $(OUTPUTDIR) $(FTP_TARGET_DIR); quit"
ftp_upload_clean: publish
$(DOCKER_COMPOSE_CMD) lftp ftp://$(FTP_USER):$(FTP_PASS)@$(FTP_HOST) -e "set ssl:verify-certificate no; mirror -R --no-perms --parallel=4 -e -v $(OUTPUTDIR) $(FTP_TARGET_DIR); quit"

View File

@ -1,9 +1,8 @@
version: '3'
services:
blog:
build:
context: writing_env/
image: xsteadfastx/blog
build: writing_env/
image: xsteadfastx/blog
container_name: blog
environment:
- BLOG_UID=1000

View File

@ -1,4 +1,4 @@
FROM alpine:edge
FROM alpine:3.9
ENV LANG C.UTF-8
ENV SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt

View File

@ -16,11 +16,13 @@
- ca-certificates
- coreutils
- curl
- cython
- gcc
- git
- grep
- imagemagick
- lftp
- linux-headers
- make
- musl-dev
- nodejs