Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0533868bf8 | |||
| 7789e0054a | |||
| 8621903d19 | |||
| 20a5c7cdaa | |||
| fc0b8cfbea | |||
| 5a064a882a | |||
| b2369ba59c | |||
| e6b4191542 | |||
| 35ebb8599c | |||
| bedfc5d3d6 | |||
| 48da389796 | |||
| 53d8dc7c26 |
19
.drone.yml
19
.drone.yml
@@ -1,19 +0,0 @@
|
||||
kind: pipeline
|
||||
type: kubernetes
|
||||
name: default
|
||||
|
||||
steps:
|
||||
- name: docker
|
||||
image: harbor.ntppool.org/ntppool/drone-kaniko:main
|
||||
pull: always
|
||||
settings:
|
||||
dockerfile: Dockerfile
|
||||
repo: library/static-web
|
||||
registry: harbor.ntppool.org
|
||||
auto_tag: true
|
||||
tags: SHA7,${DRONE_SOURCE_BRANCH}
|
||||
cache: true
|
||||
username:
|
||||
from_secret: harbor_library_username
|
||||
password:
|
||||
from_secret: harbor_library_password
|
||||
27
.woodpecker.yaml
Normal file
27
.woodpecker.yaml
Normal file
@@ -0,0 +1,27 @@
|
||||
when:
|
||||
- event: [push, pull_request, manual, tag]
|
||||
|
||||
steps:
|
||||
- name: generate-tags
|
||||
image: ghcr.io/abh/woodpecker-docker-tags-plugin:sha-86e52ce
|
||||
settings:
|
||||
tags: |
|
||||
branch
|
||||
sha
|
||||
edge
|
||||
raw -v build-${CI_PIPELINE_NUMBER}
|
||||
semver --format {{major}}
|
||||
semver --format {{major}}.{{minor}}
|
||||
semver --format {{major}}.{{minor}}.{{patch}}
|
||||
|
||||
- name: docker
|
||||
image: woodpeckerci/plugin-kaniko
|
||||
settings:
|
||||
dockerfile: Dockerfile
|
||||
registry: harbor.ntppool.org
|
||||
repo: library/static-web
|
||||
cache: true
|
||||
username:
|
||||
from_secret: harbor_library_username
|
||||
password:
|
||||
from_secret: harbor_library_password
|
||||
@@ -1,11 +1,11 @@
|
||||
FROM harbor.ntppool.org/perlorg/base-os:3.13.5-1
|
||||
FROM harbor.ntppool.org/perlorg/base-os:3.23.3
|
||||
ENV BUILD_VERSION 1
|
||||
USER root
|
||||
WORKDIR /web
|
||||
VOLUME /git
|
||||
VOLUME /web/config
|
||||
RUN apk --no-cache upgrade
|
||||
RUN apk --no-cache add apache2 apache2-utils apache2-proxy apache2-ssl apr-util-dbd_sqlite3 sqlite
|
||||
RUN apk --no-cache add apache2 apache2-utils apache2-proxy apache2-http2 apache2-brotli apache2-ssl apr-util-dbd_sqlite3 sqlite
|
||||
#RUN mkdir /run/apache2; chown apache:apache /run/apache2
|
||||
RUN mv /etc/apache2/conf.d/proxy.conf /etc/apache2/conf.d/proxy.conf.disabled
|
||||
RUN ln -s /dev/stderr /var/log/apache2/error.log
|
||||
|
||||
14
README.md
14
README.md
@@ -2,12 +2,12 @@
|
||||
|
||||
## Test locally
|
||||
|
||||
docker build -t quay.io/perl/static-web:v1.2.0 .
|
||||
docker build -t static-web:1 .
|
||||
git clone git@git.develooper.com:perl-static-misc.git git
|
||||
|
||||
docker run -p 8000:80 --name static-misc \
|
||||
-v `pwd`/git:/git/static -v `pwd`/config:/web/config \
|
||||
-ti --rm quay.io/perl/static-web:v1.2.0
|
||||
-ti --rm static-web:1
|
||||
|
||||
Test with
|
||||
|
||||
@@ -21,12 +21,6 @@ And then run `curl -H 'Host: i.perl.org' localhost` there.
|
||||
|
||||
## Production image
|
||||
|
||||
The "production image" is in https://quay.io/perl/static-web - the image
|
||||
is "manually" built and pushed because I didn't want to give quay access
|
||||
to all of this git repository.
|
||||
|
||||
REV=v1.0
|
||||
IMAGE=quay.io/perl/static-web:$REV
|
||||
docker build -t $IMAGE . && \
|
||||
docker push $IMAGE
|
||||
The "production image" is at harbor.ntppool.org/library/static-web:latest
|
||||
(or rather tagged with the most recent version, for example 2.2.0)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user