Add a docs plan to convey and remove the old doxygen dockerfile release-2.x.y

Wed, 29 Sep 2021 16:36:42 -0500

author
Gary Kramlich <grim@reaperworld.com>
date
Wed, 29 Sep 2021 16:36:42 -0500
branch
release-2.x.y
changeset 41061
03ad128b5361
parent 41055
740dafa46e5e
child 41079
658471e41d75

Add a docs plan to convey and remove the old doxygen dockerfile

Testing Done:
Ran the plan locally and verified it was working as expected.

Reviewed at https://reviews.imfreedom.org/r/958/

Dockerfile.doxygen file | annotate | diff | comparison | revisions
convey.yml file | annotate | diff | comparison | revisions
--- a/Dockerfile.doxygen	Thu Sep 23 23:27:18 2021 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-FROM pidgin/release-builder:release-2.x.y AS build
-
-COPY . /pidgin
-
-RUN set -ex && \
-	cd /pidgin && \
-	./autogen.sh --enable-debug && \
-	make -s -j$(nproc) docs
-
-FROM rwgrim/goserve
-
-EXPOSE 3000
-
-COPY --from=build /pidgin/doc/html html
-
--- a/convey.yml	Thu Sep 23 23:27:18 2021 -0500
+++ b/convey.yml	Wed Sep 29 16:36:42 2021 -0500
@@ -1,43 +1,40 @@
 environment:
-  - REPO=pidgin/pidgin2-docs
-  - TAG=latest
-  - REGISTRY=docker.io
-  - REGISTRY_USERNAME
-  - REGISTRY_PASSWORD
+  - DOCS_BUILD_IMAGE=pidgin/2.x.y-builders:debian-bookworm-amd64
 
 tasks:
+  clean:
+    type: convey/clean
+    files:
+      - pidgin2-docs
+
+  docs-build:
+    type: docker/run
+    image: ${DOCS_BUILD_IMAGE}
+    workdir: ${CONVEY_WORKSPACE}
+    script:
+      - set -ex
+      - ./autogen.sh --disable-gevolution
+      - make -s -j$(nproc) docs
+
+  docs-clean:
+    type: convey/clean
+    files:
+      - pidgin2-docs
+
+  docs-export:
+    type: docker/export
+    files:
+      - doc/html:pidgin2-docs
+
   import:
     type: docker/import
     files: .:.
 
-  build:
-    type: docker/build
-    dockerfile: Dockerfile.doxygen
-    tag: ${REGISTRY}/${REPO}:${TAG}
-    files: .:.
-
-  login:
-    type: docker/login
-    username: ${REGISTRY_USERNAME}
-    password: ${REGISTRY_PASSWORD}
-    server: ${REGISTRY}
-
-  logout:
-    type: docker/logout
-    server: ${REGISTRY}
+plans:
+  clean:
+    stages:
+      - tasks: [clean]
 
-  push:
-    type: docker/push
-    images: ${REGISTRY}/${REPO}:${TAG}
-
-plans:
-  default:
+  docs:
     stages:
-      - tasks: [import, build]
-
-  ci:
-    stages:
-      - tasks: [import, build, login, push]
-      - tasks: [logout]
-        run: always
-
+      - tasks: [docs-clean, import, docs-build, docs-export]

mercurial