Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: haiku/infrastructure
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd64c445de7b
Choose a base ref
...
head repository: haiku/infrastructure
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ad2f4908daa
Choose a head ref
  • 1 commit
  • 4 files changed
  • 1 contributor

Commits on Oct 4, 2021

  1. generate-download-pages: cleanup; drop symlinkbot; update tests 

    * Symlinkbot no longer needed / viable since we moved away from
  a local s3 bucket to a remote one.
* This functionality was replaced by hpkgbouncer which "redirects"
  /current to the latst hrev @ wasabi
* Add healthcheck
* Add port expose for 80 and improve test target
* Refine from container to be "fully qualified" on the proper registry
    @kallisti5
    kallisti5 committed Oct 4, 2021
    Copy the full SHA
    9ad2f49 View commit details
Showing with 9 additions and 19 deletions.
  1. +5 −5 containers/download/Dockerfile
  2. +1 −1 containers/download/Makefile
  3. +3 −3 containers/download/requirements.txt
  4. +0 −10 containers/download/supervisord.conf
10 changes: 5 additions & 5 deletions containers/download/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
FROM alpine
FROM docker.io/alpine
MAINTAINER Haiku, Inc <haiku-inc@gmail.com>

ADD requirements.txt /

RUN apk add --update python3 python3-dev py-pip git libgcc
RUN apk add --update python3 python3-dev py-pip git libgcc curl
RUN pip install -r /requirements.txt
RUN git clone https://github.com/haiku/generate-download-pages.git /generate-download-pages
RUN mkdir /generate-download-pages/output

ADD site-generator /usr/local/bin/site-generator
RUN chmod 755 /usr/local/bin/site-generator

ADD https://gitlab.com/kallisti5/symlinkbot/uploads/67fa87370323b10ca8ad0d00da57f86f/symlinkbot-linux_musl-x86_64 /usr/local/bin/symlinkbot
RUN chmod 755 /usr/local/bin/symlinkbot

ADD supervisord.conf /etc/supervisord.conf

EXPOSE 80
HEALTHCHECK --start-period=3m --retries=2 CMD curl --fail http://`hostname`:80/ || exit 1

VOLUME ["/secrets", "/data"]
CMD ["/usr/bin/supervisord"]
2 changes: 1 addition & 1 deletion containers/download/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
default:
docker build --no-cache --tag docker.io/haiku/download:latest .
test:
docker run -d --name download-test docker.io/haiku/download:latest
docker run -d --name download-test -P docker.io/haiku/download:latest
clean:
docker stop download-test
docker rm download-test
6 changes: 3 additions & 3 deletions containers/download/requirements.txt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# packages required for the download generator script
boto==2.49.0
Mako==1.1.3
toml==0.10.1
boto
Mako
toml

# tools for the image
supervisor
10 changes: 0 additions & 10 deletions containers/download/supervisord.conf
View file
Original file line number Diff line number Diff line change
@@ -9,16 +9,6 @@ command=/usr/local/bin/site-generator
autorestart=true
redirect_stderr=true

[program:symlinkbot-master]
command=/usr/local/bin/symlinkbot /data/haiku-repositories/master
autorestart=true
redirect_stderr=true

[program:symlinkbot-r1beta1]
command=/usr/local/bin/symlinkbot /data/haiku-repositories/r1beta1
autorestart=true
redirect_stderr=true

[program:simplehttp]
command=/usr/bin/python3 -m http.server 80
directory=/generate-download-pages/output