Merge pull request 'New Build process and small changes' (#20) from devel into master
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #20
This commit is contained in:
commit
f29e7d4dcd
@ -16,23 +16,19 @@ steps:
|
|||||||
password:
|
password:
|
||||||
from_secret: gitea_token
|
from_secret: gitea_token
|
||||||
tags: latest
|
tags: latest
|
||||||
#
|
when:
|
||||||
#- name: publish Website
|
- branch: master
|
||||||
# image: appleboy/drone-ssh
|
|
||||||
# settings:
|
- name: docker-devel
|
||||||
# host: freifunk-rhein-sieg.net
|
image: woodpeckerci/plugin-docker-buildx
|
||||||
# port: 22
|
settings:
|
||||||
# username: dronebot
|
platforms: linux/amd64
|
||||||
# password:
|
registry: git.freifunk-rhein-sieg.net
|
||||||
# from_secret: ffrs_server_password
|
repo: git.freifunk-rhein-sieg.net/freifunk-rhein-sieg/freifunk-rhein-sieg.net
|
||||||
# script:
|
username:
|
||||||
# - cd /opt/docker/ffrs-website-docker-compose/
|
from_secret: gitea_user
|
||||||
# - docker-compose pull
|
password:
|
||||||
# - docker-compose up -d
|
from_secret: gitea_token
|
||||||
#
|
tags: devel
|
||||||
#- name: slack
|
when:
|
||||||
# image: plugins/slack
|
- branch: devel
|
||||||
# settings:
|
|
||||||
# webhook:
|
|
||||||
# from_secret: slack_webhook
|
|
||||||
# channel: z_rhein-sieg-website
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
FROM klakegg/hugo:0.101.0-onbuild AS builder
|
FROM klakegg/hugo:0.64.0-onbuild AS builder
|
||||||
|
|
||||||
FROM nginx:1.25.2-alpine
|
FROM nginx:1.25.2-alpine
|
||||||
COPY --from=builder /target /usr/share/nginx/html
|
COPY --from=builder /target /usr/share/nginx/html
|
||||||
|
@ -13,6 +13,6 @@
|
|||||||
{{ end }}
|
{{ end }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
</ul>
|
</ul>
|
||||||
© 2019 Freifunk Rhein-Sieg e.V.
|
© 2023 Freifunk Rhein-Sieg e.V.
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
Loading…
Reference in New Issue
Block a user