Skip to content

Commit

Permalink
containers/www-build: Cleanup container, add SVGs vs PNGs for scale
Browse files Browse the repository at this point in the history
  • Loading branch information
kallisti5 committed Jan 7, 2025
1 parent 6571e0d commit 365f9ad
Show file tree
Hide file tree
Showing 9 changed files with 220 additions and 13 deletions.
9 changes: 5 additions & 4 deletions containers/services/www-build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
FROM docker.io/nginx:alpine
MAINTAINER Haiku, Inc <[email protected]>

LABEL org.opencontainers.image.source https://github.com/haiku/infrastructure
LABEL org.opencontainers.image.url https://github.com/haiku/infrastructure/tree/master/containers/services/www-build
LABEL org.opencontainers.image.vendor Haiku, Inc.
LABEL org.opencontainers.image.source="https://github.com/haiku/infrastructure"
LABEL org.opencontainers.image.url="https://github.com/haiku/infrastructure/tree/main/containers/services/www-build"
LABEL org.opencontainers.image.authors="Haiku, Inc."
LABEL org.opencontainers.image.vendor="Haiku, Inc."
LABEL org.opencontainers.image.description="www-build static page for Haiku"

RUN mkdir -p /var/lib/www

Expand Down
10 changes: 5 additions & 5 deletions containers/services/www-build/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
VERSION = latest
VERSION = $(shell cat VERSION | grep -Ev "^#" | tail -1)-development
REGISTRY = ghcr.io/haiku
default:
docker build --no-cache --tag ${REGISTRY}/www-build:${VERSION} .
push:
docker push ${REGISTRY}/www-build:${VERSION}
podman build --no-cache --tag ${REGISTRY}/www-build:${VERSION} .
test:
docker run -P ${REGISTRY}/www-build:${VERSION}
podman kill www-build-test || true
podman run -d --replace --name www-build-test -P ${REGISTRY}/www-build:$(VERSION)
@echo "http://`podman port www-build-test 80 | sed 's/0.0.0.0/127.0.0.1/'`"
2 changes: 2 additions & 0 deletions containers/services/www-build/VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# ONLY UPDATE ONCE READY TO BUILD NEW RELEASE
20250107
88 changes: 88 additions & 0 deletions containers/services/www-build/www/images/App_Installer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
76 changes: 76 additions & 0 deletions containers/services/www-build/www/images/File_Archive_HPKG.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed containers/services/www-build/www/images/hpkg_64.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
48 changes: 44 additions & 4 deletions containers/services/www-build/www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,59 @@
<body>
<div class="container">
<div class="row">
<div class="eleven columns" style="margin-top: 20%; margin-bottom: 100px;">
<center><img src="images/logo_black_transparent.png"></center>
<div class="eleven columns" style="margin-top: 10%; margin-bottom: 100px;">
<center>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 683 178" style="height: 10em" color-interpolation="linearRGB">
<g>
<path style="fill:#010101"
d="M88.01 33.02v106.92h13.96v-106.92h-13.96v0z
M151.02 33.02c0 35.53 0 71.38 0 106.92h13.94v-106.92h-13.94v0z
M253.52 28.18l-50.42 111.76h14.09l36.32 -81.58l35.27 81.58h14.08l-49.36 -111.76h0z
M341.01 33.02v106.92h13.96v-106.92h-13.96v0z
M405.01 33.02v106.92h13.93v-44.5l4.48 -5.36l39.48 49.88h17.52l-47.73 -58.93l47 -48h-16.98l-43.79 46.3v-46.3h-13.92l0 -0z
M581.01 33.02v64.28c0 10.23 -2.13 18.19 -6.28 23.88c-4.13 5.68 -10.54 7.88 -19.21 7.88c-9.08 0 -15.39 -3.48 -19.21 -9.71c-3.83 -6.23 -5.33 -12.52 -5.33 -20.91v-65.41h-13.91v68.64c0 6.48 1.57 12.99 4.27 19.15c2.69 6.16 6.98 11.09 12.72 15.12c5.71 4.02 12.96 5.94 21.46 6.03c5.61 0 10.77 -0.83 15.47 -2.78c4.7 -1.97 8.75 -4.8 12.19 -8.47c3.41 -3.67 6.03 -8.03 7.88 -13.1c1.82 -5.04 2.92 -10.58 2.92 -16.61v-67.97h-12.97v-0z"
/>
<radialGradient id="gradient0" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.8307,-0.3373,0.1335,0.2809,128.4185,78.0485)">
<stop offset="0" stop-color="#32962b"/>
<stop offset="1" stop-color="#a9ff00"/>
</radialGradient>
<path style="fill:url(#gradient0)"
d="M83.69 101.52c13.95 13.37 28.42 17.25 42.67 14.8c-2.34 -1.72 -3.45 -3.83 -4.38 -5.56c15.92 9.08 23.87 -2.22 28.79 -5.86c-1.69 -1.37 -3.75 -0.3 -7.14 -4.43c4.34 0.59 7.17 0.37 11.19 0.36c2.51 -2.33 6.31 -4.16 8.65 -6.94c2.88 -3.41 6.55 -8.08 9.55 -11.97c-1.92 -1.18 -2.31 -2.22 -3.05 -3.69c1.77 0.44 3.54 0.66 5.32 0.63c2.37 -4.5 6.13 -7.33 8.66 -8.52c-10.54 -3.66 -24.04 -3.16 -33.82 -1.16c-3.25 2.79 -3.15 6.41 -4.22 12.38c-2.04 -2.67 -2.96 -6.02 -1.75 -10.65c-6.88 2.16 -13.58 5.08 -20.04 8.11c-2.5 1.17 -8.65 5.56 -12.25 6.96c-1.7 2.54 -3.12 4.98 -4.29 7.32c-0.06 -2.15 -0.41 -4.27 -0.24 -6.48c-11.82 1.84 -18.28 5.01 -25.66 11.56c-15.79 0.05 -33.5 -6.72 -33.36 -9.16l-0.32 5.72c0 0 19.72 7.48 35.76 6.58h-0.03z"
/>
<radialGradient id="gradient1" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.6661,-0.0701,0.0251,0.2389,251.932,85.249)">
<stop offset="0" stop-color="#f43d05"/>
<stop offset="1" stop-color="#ffaa00"/>
</radialGradient>
<path style="fill:url(#gradient1)"
d="M295.6 113c-8.39 -17.4 -20.6 -26.08 -34.8 -28.76c1.58 2.43 1.89 4.79 2.16 6.73c-11.74 -14.06 -23.16 -6.23 -29.03 -4.55c1.1 1.87 3.4 1.59 5.15 6.65c-3.87 -2.08 -6.6 -2.87 -10.35 -4.23c-3.18 1.29 -7.38 1.69 -10.54 3.47c-3.89 2.19 -8.95 5.27 -13.12 7.88c1.38 1.77 1.38 2.89 1.55 4.52c-1.5 -1.04 -3.08 -1.86 -4.75 -2.45c-3.8 3.37 -8.32 4.72 -11.11 4.97c8.59 7.1 21.41 11.35 31.27 12.89c4.02 -1.46 5.19 -4.89 8.27 -10.11c0.97 3.22 0.66 6.68 -2.05 10.59c7.22 0.37 14.5 -0.02 21.61 -0.59c2.77 -0.22 10.06 -2.2 13.9 -2.24c2.5 -1.78 4.68 -3.57 6.58 -5.35c-0.67 2.04 -1.1 4.14 -2.02 6.15c11.73 2.38 18.88 1.69 28.1 -1.87c14.82 5.46 29.05 18.01 28.05 20.25l2.32 -5.25c0 0 -15.85 -13.9 -31.2 -18.65v-0.04z"
/>
<radialGradient id="gradient2" gradientUnits="userSpaceOnUse" cx="0" cy="0" r="200" gradientTransform="matrix(0.1293,-0.2356,-0.2757,-0.3163,567.2067,112.1813)">
<stop offset="0" stop-color="#f6a407"/>
<stop offset="1" stop-color="#ffe56d"/>
</radialGradient>
<path style="fill:url(#gradient2)"
d="M563.97 88.69c-3 15.72 0.8 27.54 8.95 36.36c0.14 -2.41 1.1 -4.13 1.89 -5.55c0.85 15.16 12.33 15.6 17.07 17.36c0.19 -1.78 -1.48 -2.73 -0.14 -6.97c1.53 3.3 2.96 5.17 4.78 7.94c2.76 0.69 5.75 2.51 8.73 2.88c3.67 0.46 8.57 0.9 12.63 1.24c-0.04 -1.86 0.5 -2.61 1.19 -3.79c0.47 1.44 1.12 2.77 1.94 3.99c4.2 -0.36 7.86 0.96 9.85 2.18c-2.2 -8.98 -8.63 -18.15 -14.44 -24.05c-3.41 -1.01 -5.89 0.68 -10.51 2.63c0.92 -2.63 2.84 -4.77 6.6 -6.02c-4.61 -3.81 -9.66 -7.14 -14.69 -10.28c-1.95 -1.21 -7.78 -3.5 -10.36 -5.37c-2.54 -0.04 -4.89 0.06 -7.03 0.3c1.46 -1.01 2.78 -2.2 4.39 -3.08c-6.63 -7.38 -11.72 -10.45 -19.63 -12.63c-7.15 -10.95 -10.42 -26.35 -8.66 -27.35l-4.14 2.35c0 0 3.68 17.08 11.55 27.83l0.01 0.02z"
/>
<path style="fill:#010101"
d="M622.72 41.54c0 -2.24 0.82 -4.21 2.48 -5.91c1.65 -1.7 3.82 -2.55 6.5 -2.55c2.25 0 4.23 0.8 5.93 2.42c1.7 1.61 2.55 3.63 2.55 6.05c0 2.3 -0.79 4.34 -2.38 6.13c-1.59 1.78 -3.68 2.68 -6.27 2.68c-0.05 0 -0.11 0 -0.16 0c-0.05 0 -0.1 0 -0.16 0c-2.38 -0.07 -4.3 -0.84 -5.73 -2.3c-1.43 -1.46 -2.31 -3.07 -2.63 -4.83c-0.02 -0.21 -0.05 -0.44 -0.07 -0.67c-0.02 -0.22 -0.03 -0.45 -0.03 -0.67c0 -0.05 0 -0.11 0 -0.16c0 -0.05 0 -0.1 0 -0.16v-0.02z
M638.64 41.36c0 -0.02 0 -0.06 0 -0.1c0 -0.04 0 -0.09 0 -0.15c0 -0.23 -0.01 -0.47 -0.04 -0.72c-0.02 -0.24 -0.08 -0.49 -0.15 -0.74c-0.33 -1.29 -1.08 -2.47 -2.25 -3.55c-1.16 -1.07 -2.66 -1.61 -4.49 -1.61c-0.02 0 -0.05 0 -0.07 0c-0.02 0 -0.04 0 -0.07 0c-0.02 0 -0.05 0 -0.07 0c-0.02 0 -0.04 0 -0.07 0c-2.06 0.07 -3.66 0.66 -4.78 1.78c-1.12 1.11 -1.86 2.33 -2.23 3.65c-0.08 0.35 -0.15 0.69 -0.19 1.03c-0.04 0.33 -0.06 0.66 -0.06 0.98c0.05 1.7 0.53 3.07 1.41 4.12c0.88 1.04 1.85 1.81 2.91 2.29c0.49 0.23 0.98 0.4 1.46 0.51c0.47 0.1 0.91 0.16 1.3 0.16c2.02 0 3.65 -0.58 4.9 -1.74c1.24 -1.16 2.03 -2.45 2.37 -3.85c0.05 -0.23 0.1 -0.47 0.13 -0.71c0.02 -0.24 0.04 -0.48 0.04 -0.71c0 -0.1 0 -0.2 0 -0.29c0 -0.09 -0 -0.19 -0.02 -0.29v-0.02z
M627.91 37.03h4.33c1.04 0.01 1.82 0.21 2.34 0.59c0.52 0.38 0.78 1 0.78 1.86c0 0.85 -0.19 1.48 -0.58 1.89c-0.38 0.41 -1.05 0.7 -2.01 0.87l2.59 4.31h-1.73l-2.41 -4.33h-1.91v4.33h-1.38v-9.54z
M632.07 38.26h-2.77v2.59h2.94c0.6 0.01 1.04 -0.09 1.31 -0.32c0.27 -0.23 0.41 -0.52 0.41 -0.85c0 -0.35 -0.14 -0.67 -0.43 -0.95c-0.29 -0.28 -0.78 -0.42 -1.47 -0.42v-0.02z"
/>
</g>
</svg><br/><hr/><b>Build Services</b>
</center>
</div>
</div>
<div class="row">
<div class="six columns">
<img src="images/installer_64.png">
<img src="images/App_Installer.svg" height=64>
<h4>Concourse</h4>
<p>Continuously compiles <a href="https://git.haiku-os.org">Haiku's source code</a> on changes and generates <a href="https://download.haiku-os.org">nightly images.</a></p>
<a class="button" href="https://ci.haiku-os.org">Concourse ></a>
</div>
<div class="six columns">
<img src="images/hpkg_64.png">
<img src="images/File_Archive_HPKG.svg" height=64>
<h4>Buildmaster</h4>
<p>Continiously builds <a href="http://github.com/haikuports/haikuports">HaikuPorts</a> packages and update Haiku's software repositories.</p>
<a class="button" href="/buildmaster/master/x86_gcc2/">Buildmaster x86_gcc2</a><br/>
Expand Down

0 comments on commit 365f9ad

Please sign in to comment.