attempt 2 at BUILT_BY in Docker CI

woodpecker: add "built by" for docker builds
hopefully works? but untested since it doesn't really matter.
2024-12-26 02:50:12 +00:00 · 2024-07-26 16:25:38 +01:00 · 2024-07-26 13:07:41 +01:00 · 2024-07-26 12:57:43 +01:00 · 2024-07-26 12:45:57 +01:00 · 2024-07-26 12:45:24 +01:00
7 changed files with 152 additions and 7 deletions
--- a/.drone.yml.old
+++ b/.drone.yml.old
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@ -80,6 +80,9 @@ builds:
      dir: ./
      env:
        - CGO_ENABLED=1
+        - CC=x86_64-linux-gnu-gcc
+        - CXX=x86_64-linux-gnu-gcc
+        - PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig:$PKG_CONFIG_PATH
      flags:
        - -tags=tray
      ldflags:
--- a/.woodpecker/git-binary.yaml
+++ b/.woodpecker/git-binary.yaml
@ -0,0 +1,48 @@
+when:
+  - event: push
+    branch: main
+  #  - evaluate: 'CI_PIPELINE_EVENT != "PULL_REQUEST" && CI_COMMIT_BRANCH == CI_REPO_DEFAULT_BRANCH'
+
+clone:
+    git:
+        image: woodpeckerci/plugin-git
+        settings:
+            tags: true
+
+steps:
+  - name: redoc
+    image: docker.io/hrfee/jfa-go-build-docker:latest
+    environment:
+        REDOC_SSH_ID:
+            from_secret: REDOC_SSH_ID
+    commands:
+      - sh -c "echo \"$REDOC_SSH_ID\" > /tmp/id_redoc && chmod 600 /tmp/id_redoc"
+      - bash -c 'sftp -P 3625 -i /tmp/id_redoc -o StrictHostKeyChecking=no redoc@api.jfa-go.com:/home/redoc <<< $"put docs/swagger.json jfa-go.json"'
+  - name: build
+    image: docker.io/hrfee/jfa-go-build-docker:latest
+    environment:
+        JFA_GO_SNAPSHOT: y
+        JFA_GO_BUILT_BY:
+            from_secret: BUILT_BY
+    commands:
+      - curl -sfL https://goreleaser.com/static/run > goreleaser
+      - chmod +x goreleaser
+      - ./scripts/version.sh ./goreleaser --snapshot --skip=publish --clean
+  - name: deb-repo
+    image: docker.io/hrfee/jfa-go-build-docker:latest
+    environment:
+        REPO_SSH_ID:
+            from_secret: REPO_SSH_ID
+    commands:
+      - sh -c "echo \"$REPO_SSH_ID\" > /tmp/id_repo && chmod 600 /tmp/id_repo"
+      - bash -c 'sftp -P 2022 -i /tmp/id_repo -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"'
+      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "repo-process-deb trusty"'
+      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "rm -f /repo/incoming/*.deb"'
+  - name: buildrone
+    image: docker.io/hrfee/jfa-go-build-docker:latest
+    environment:
+        BUILDRONE_KEY:
+            from_secret: BUILDRONE_KEY
+    commands:
+      - wget https://builds.hrfee.pw/upload.py
+      - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --upload ./dist/*.zip ./dist/*.rpm ./dist/*.apk --tag internal-git=true'
--- a/.woodpecker/git-docker.yaml
+++ b/.woodpecker/git-docker.yaml
@ -0,0 +1,29 @@
+when:
+  - event: push
+    branch: main
+
+steps:
+  - name: build
+    image: docker.io/woodpeckerci/plugin-docker-buildx
+    secrets: [ BUILT_BY ]
+    settings:
+        username:
+            from_secret: DOCKER_USERNAME
+        password:
+            from_secret: DOCKER_TOKEN
+        repo: docker.io/hrfee/jfa-go
+        tags: unstable
+        registry: docker.io
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        build_args:
+          - BUILT_BY: $BUILT_BY
+  - name: buildrone
+    image: docker.io/python
+    environment:
+        BUILDRONE_KEY:
+            from_secret: BUILDRONE_KEY
+    commands:
+      - wget https://builds.hrfee.pw/upload.py
+      - pip install requests
+      - python upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-unstable=true
+
--- a/.woodpecker/stable-binary.yaml
+++ b/.woodpecker/stable-binary.yaml
@ -0,0 +1,32 @@
+when:
+  - event: tag
+    branch: main
+
+steps:
+  - name: build
+    image: docker.io/hrfee/jfa-go-build-docker:latest
+    environment:
+        JFA_GO_BUILT_BY:
+            from_secret: BUILT_BY
+    commands:
+      - curl -sfL https://goreleaser.com/static/run > ../goreleaser
+      - chmod +x ../goreleaser
+      - ./scripts/version.sh ../goreleaser
+  - name: deb-repo
+    image: docker.io/hrfee/jfa-go-build-docker:latest
+    environment:
+        REPO_SSH_ID:
+            from_secret: REPO_SSH_ID
+    commands:
+      - sh -c "echo \"$REPO_SSH_ID\" > /tmp/id_repo && chmod 600 /tmp/id_repo"
+      - bash -c 'sftp -P 2022 -i /tmp/id_repo -o StrictHostKeyChecking=no root@161.97.102.153:/repo/incoming <<< $"put dist/*.deb"'
+      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "repo-process-deb trusty"'
+      - bash -c 'ssh -i /tmp/id_repo root@161.97.102.153 -p 2022 "rm -f /repo/incoming/*.deb"'
+  - name: buildrone
+    image: docker.io/hrfee/jfa-go-build-docker:latest
+    environment:
+        BUILDRONE_KEY:
+            from_secret: BUILDRONE_KEY
+    commands:
+      - wget https://builds.hrfee.pw/upload.py
+      - bash -c 'python3 upload.py https://builds.hrfee.pw hrfee jfa-go --tag internal=true'
--- a/.woodpecker/stable-docker.yaml
+++ b/.woodpecker/stable-docker.yaml
@ -0,0 +1,29 @@
+when:
+  - event: tag
+    branch: main
+
+steps:
+  - name: build
+    image: docker.io/woodpeckerci/plugin-docker-buildx
+    secrets: [ BUILT_BY ]
+    settings:
+        username:
+            from_secret: DOCKER_USERNAME
+        password:
+            from_secret: DOCKER_TOKEN
+        repo: docker.io/hrfee/jfa-go
+        tags: latest
+        registry: docker.io
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        build_args:
+          - BUILT_BY: $BUILT_BY
+  - name: buildrone
+    image: docker.io/python
+    environment:
+        BUILDRONE_KEY:
+            from_secret: BUILDRONE_KEY
+    commands:
+      - wget https://builds.hrfee.pw/upload.py
+      - pip install requests
+      - python upload.py https://builds.hrfee.pw hrfee jfa-go --tag docker-stable=true
+
--- a/18
+++ b/18
@ -1,18 +1,22 @@
-FROM --platform=$BUILDPLATFORM golang:latest AS support
+# Use this instead if hrfee/jfa-go-build-docker doesn't support your architecture
+# FROM --platform=$BUILDPLATFORM golang:latest AS support
+FROM --platform=$BUILDPLATFORM hrfee/jfa-go-build-docker AS support

 COPY . /opt/build

-RUN apt-get update -y \
-    && apt-get install build-essential python3-pip curl software-properties-common sed -y \
-    && (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \
-    && apt-get install nodejs \
-    && (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \
+# Uncomment this if hrfee/jfa-go-build-docker doesn't support your architecture
+# RUN apt-get update -y \
+#     && apt-get install build-essential python3-pip -y \
+#     && (curl -sL https://deb.nodesource.com/setup_current.x | bash -) \
+#     && apt-get install nodejs
+RUN (cd /opt/build; make configuration npm email typescript variants-html bundle-css inline-css swagger copy INTERNAL=off GOESBUILD=on) \
    && sed -i 's#id="password_resets-watch_directory" placeholder="/config/jellyfin"#id="password_resets-watch_directory" value="/jf" disabled#g' /opt/build/build/data/html/setup.html

-
 FROM --platform=$BUILDPLATFORM golang:latest AS build
 ARG TARGETARCH
 ENV GOARCH=$TARGETARCH
+ARG BUILT_BY
+ENV BUILTBY=$BUILT_BY

 COPY --from=support /opt/build /opt/build
Author	SHA1	Message	Date
Harvey Tindall	c5d45355a8	attempt 2 at BUILT_BY in Docker CI	2024-07-26 16:25:38 +01:00
Harvey Tindall	1a85feb344	woodpecker: add "built by" for docker builds hopefully works? but untested since it doesn't really matter.	2024-07-26 13:07:41 +01:00
Harvey Tindall	c75418db67	woodpecker: fix FIXME'd docker tags forgot to change them from the private test repo.	2024-07-26 12:57:43 +01:00
Harvey Tindall	7c8e463929	ci: migrate to woodpecker on arm64 as part of migrating most of my services to a new server, I've switched CI to woodpecker, a fork of drone. CI configs are now in .woodpecker/, and are neater. The server runs on arm64, so the configs and prerequisite jfa-go-build-docker are built to run there primarily. They should work on other platforms still. New CI is at ci.hrfee.dev.	2024-07-26 12:45:57 +01:00
Harvey Tindall	8f04f49086	docker: use jfa-go-build-docker for quicker builds we already make the prerequisite container, why not use it for docker builds as well?	2024-07-26 12:45:24 +01:00
Harvey Tindall	ec2f826dec	goreleaser: support building on non-x86-64 host jfa-go-build-docker is now built for an arm64 host primarily, and the manually specified x86-64 (cross)compiler and pkg-config means compilation will work on it (or another architecture in future).	2024-07-26 12:42:38 +01:00