diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..8adda2e --- /dev/null +++ b/.drone.yml @@ -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 diff --git a/.gitmodules b/.gitmodules index e85a2ec..6a0ef11 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/Makefile b/Makefile index 472c686..d6e68e2 100644 --- a/Makefile +++ b/Makefile @@ -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" diff --git a/docker-compose.yml b/docker-compose.yml index 9e3f489..ccc3b46 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/writing_env/Dockerfile b/writing_env/Dockerfile index 7d2b59c..3b704d1 100644 --- a/writing_env/Dockerfile +++ b/writing_env/Dockerfile @@ -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 diff --git a/writing_env/root/home/blog/playbooks/writing_env.yml b/writing_env/root/home/blog/playbooks/writing_env.yml index 05cb3ec..020bf68 100644 --- a/writing_env/root/home/blog/playbooks/writing_env.yml +++ b/writing_env/root/home/blog/playbooks/writing_env.yml @@ -16,11 +16,13 @@ - ca-certificates - coreutils - curl + - cython - gcc - git - grep - imagemagick - lftp + - linux-headers - make - musl-dev - nodejs