fix lftp and more refactoring in writingenv
This commit is contained in:
parent
bff1571b4e
commit
0c7bbcc988
2
Makefile
2
Makefile
@ -102,7 +102,7 @@ dropbox_upload: publish
|
|||||||
cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
|
cp -r $(OUTPUTDIR)/* $(DROPBOX_DIR)
|
||||||
|
|
||||||
ftp_upload: publish
|
ftp_upload: publish
|
||||||
lftp ftp://$(FTP_USER):$(FTP_PASS)@$(FTP_HOST) -e "set ftp:ssl-allow 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"
|
||||||
|
|
||||||
s3_upload: publish
|
s3_upload: publish
|
||||||
s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
|
s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
|
||||||
|
@ -1,15 +1,19 @@
|
|||||||
FROM alpine:3.5
|
FROM alpine:3.5
|
||||||
|
|
||||||
ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
ENV LANG C.UTF-8
|
||||||
ENV BLOG_UID=1000 BLOG_GID=1000
|
ENV SSL_CERT_FILE /etc/ssl/certs/ca-certificates.crt
|
||||||
|
ENV BLOG_UID 1000
|
||||||
|
ENV BLOG_GID 1000
|
||||||
|
|
||||||
ADD root /
|
ADD root /
|
||||||
|
|
||||||
RUN set -ex \
|
RUN set -ex \
|
||||||
&& apk add --no-cache \
|
&& apk add --update \
|
||||||
ansible \
|
ansible \
|
||||||
bash \
|
bash \
|
||||||
|
ca-certificates \
|
||||||
g++ \
|
g++ \
|
||||||
|
git \
|
||||||
openssh \
|
openssh \
|
||||||
python \
|
python \
|
||||||
sudo \
|
sudo \
|
||||||
@ -22,7 +26,10 @@ RUN set -ex \
|
|||||||
USER blog
|
USER blog
|
||||||
|
|
||||||
RUN set -ex \
|
RUN set -ex \
|
||||||
|
&& git clone https://github.com/xsteadfastx/batcave.git ~/.batcave \
|
||||||
|
&& ansible-playbook -i ~/.batcave/hosts ~/.batcave/shell.yml -c local --extra-vars="hosts=127.0.0.1" \
|
||||||
&& ansible-playbook -c local /home/blog/playbooks/writing_env.yml \
|
&& ansible-playbook -c local /home/blog/playbooks/writing_env.yml \
|
||||||
&& /bin/zsh -c "source /home/blog/.zshrc && antigen update"
|
&& /bin/zsh -c "source /home/blog/.zshrc && antigen update" \
|
||||||
|
&& sudo rm -rf /var/cache/apk/*
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/local/bin/entrypoint"]
|
ENTRYPOINT ["/usr/local/bin/entrypoint"]
|
||||||
|
@ -84,26 +84,12 @@
|
|||||||
backup=yes
|
backup=yes
|
||||||
become: yes
|
become: yes
|
||||||
|
|
||||||
- name: clone batcave
|
|
||||||
git:
|
|
||||||
repo=https://github.com/xsteadfastx/batcave.git
|
|
||||||
dest=~/.batcave
|
|
||||||
force=yes
|
|
||||||
|
|
||||||
- name: run batcave
|
|
||||||
command:
|
|
||||||
ansible-playbook -i hosts shell.yml -c local --extra-vars="hosts=127.0.0.1"
|
|
||||||
chdir=~/.batcave
|
|
||||||
environment:
|
|
||||||
SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
|
|
||||||
|
|
||||||
- name: export variables
|
- name: export variables
|
||||||
lineinfile:
|
lineinfile:
|
||||||
dest=~/.zshrc
|
dest=~/.zshrc
|
||||||
line='{{ item }}'
|
line='{{ item }}'
|
||||||
with_items:
|
with_items:
|
||||||
- export PYTHONIOENCODING=UTF-8
|
- export PYTHONIOENCODING=UTF-8
|
||||||
- export LC_ALL=C.UTF-8
|
|
||||||
- export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
- export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
|
||||||
|
|
||||||
- name: no git colors
|
- name: no git colors
|
||||||
|
Loading…
Reference in New Issue
Block a user