diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 01358a7..0000000 --- a/.dockerignore +++ /dev/null @@ -1,15 +0,0 @@ -# By default, ignore everything -* - -# Blog source -!archetypes/ -!content/ -!data/ -!layouts/ -!resources/ -!static/ -!themes/ -!config.yaml - -# Nginx config file -!nginx.conf diff --git a/.woodpecker.yml b/.woodpecker.yml index 2e3c0c2..72b3a44 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,27 +1,17 @@ pipeline: - # build: - # image: alpine:3 - # commands: - # - apk update - # - apk add --no-cache hugo - # - hugo --minify + build: + image: alpine:3 + commands: + - apk update + - apk add --no-cache hugo + - hugo --minify - # deploy: - # image: alpine:3 - # commands: - # - apk update - # - apk add --no-cache rsync openssh-client - # - eval $(ssh-agent) - # - echo "$DEPLOY_KEY" | ssh-add - - # - rsync -e "ssh -p $DEPLOY_PORT -o 'StrictHostKeyChecking=no'" -az --delete public/ "$DEPLOY_DEST" - # secrets: [ deploy_key, deploy_port, deploy_dest ] - publish: - image: plugins/docker - repo: chewingbever/blog - tag: [ latest ] - secrets: - - docker_username - - docker_password - when: - branch: master - event: push + deploy: + image: alpine:3 + commands: + - apk update + - apk add --no-cache rsync openssh-client + - eval $(ssh-agent) + - echo "$DEPLOY_KEY" | ssh-add - + - rsync -e "ssh -p $DEPLOY_PORT -o 'StrictHostKeyChecking=no'" -az --delete public/ "$DEPLOY_DEST" + secrets: [ deploy_key, deploy_port, deploy_dest ] diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index d1cd8f8..0000000 --- a/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM alpine:latest AS builder - -WORKDIR /usr/src/app - -# Install Hugo -RUN apk add --no-cache hugo - -# Copy site files for building -COPY . ./ - -# Generate the site -RUN hugo --minify - - -FROM nginx:alpine - -COPY nginx.conf /etc/nginx/nginx.conf -COPY --from=builder /usr/src/app/public /usr/share/nginx/html diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index f2fdd0d..0000000 --- a/nginx.conf +++ /dev/null @@ -1,26 +0,0 @@ -worker_processes 1; - -events { - worker_connections 1024; -} - -http { - # https://stackoverflow.com/a/51360290/6483444 - map $sent_http_content_type $expires { - default off; - text/html epoch; - text/css max; - application/javascript max; - ~image/ max; - } - - server { - server_name _; - listen 80; - - root /usr/share/nginx/html; - index index.html; - include mime.types; - expires $expires; - } -}