Compare commits

..

No commits in common. "master" and "0.9.4" have entirely different histories.

3 changed files with 56 additions and 16 deletions

View File

@ -1,37 +1,77 @@
kind: pipeline kind: pipeline
type: docker
name: default name: default
steps: steps:
- name: build-alpine
image: plugins/docker:linux-amd64
pull: always
settings:
dockerfile: Dockerfile-alpine
daemon_off: false
dry_run: true
repo: docker.asperti.com/paspo/angry-squid
tags:
- latest
- alpine-latest
when:
event:
exclude:
- tag
- name: build-debian
image: plugins/docker:linux-amd64
pull: always
settings:
dockerfile: Dockerfile-debian
daemon_off: false
dry_run: true
repo: docker.asperti.com/paspo/angry-squid
tags:
- debian-latest
when:
event:
exclude:
- tag
- name: build_and_publish-alpine - name: build_and_publish-alpine
image: plugins/docker:linux-amd64 image: plugins/docker:linux-amd64
pull: always
settings: settings:
username: dockerfile: Dockerfile-alpine
from_secret: docker_username auto_tag: true
auto_tag_suffix: alpine
force_tag: true
daemon_off: false
password: password:
from_secret: docker_password from_secret: docker_password
dockerfile: Dockerfile-alpine
registry: docker.asperti.com registry: docker.asperti.com
repo: docker.asperti.com/paspo/angry-squid repo: docker.asperti.com/paspo/angry-squid
tags: tags:
- latest - latest
- alpine-latest - alpine-latest
force_tag: true username:
from_secret: docker_username
when:
event:
- tag
- name: build_and_publish-debian - name: build_and_publish-debian
image: plugins/docker:linux-amd64 image: plugins/docker:linux-amd64
pull: always
settings: settings:
username: dockerfile: Dockerfile-debian
from_secret: docker_username auto_tag: true
auto_tag_suffix: debian
force_tag: true
daemon_off: false
password: password:
from_secret: docker_password from_secret: docker_password
dockerfile: Dockerfile-debian
registry: docker.asperti.com registry: docker.asperti.com
repo: docker.asperti.com/paspo/angry-squid repo: docker.asperti.com/paspo/angry-squid
tags: tags:
- debian-latest - debian-latest
force_tag: true username:
from_secret: docker_username
trigger: when:
event: event:
- tag - tag

View File

@ -1,4 +1,4 @@
FROM alpine:3.15 FROM alpine:3.12
RUN apk -U upgrade && \ RUN apk -U upgrade && \
apk add squid perl && \ apk add squid perl && \

View File

@ -1,4 +1,4 @@
FROM debian:11 FROM debian:10
RUN apt-get update && \ RUN apt-get update && \
apt-get -y upgrade && \ apt-get -y upgrade && \
@ -14,4 +14,4 @@ COPY storeid/* /app/storeid/
EXPOSE 3128 EXPOSE 3128
EXPOSE 3129 EXPOSE 3129
ENTRYPOINT ["/app/start.sh"] ENTRYPOINT ["/app/start.sh"]