Skip to content

Commit 9ebd025

Browse files
tcoupertcouper
committed
fix: updated for microsites
1 parent b5fe2fe commit 9ebd025

10 files changed

Lines changed: 175 additions & 123 deletions

File tree

‎.github/workflows/deploy-cloud-run.yml‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,21 @@ env:
2727
AUTH_REDIRECT_URI: ${{ vars.AUTH_REDIRECT_URI }}
2828
AUTH_POST_LOGIN_REDIRECT: ${{ vars.AUTH_POST_LOGIN_REDIRECT }}
2929
LATEST_SPEC_VERSION: ${{ vars.LATEST_SPEC_VERSION }}
30-
30+
# Image service (diagram rendering at startup build)
31+
IMAGE_SERVICE_URL: ${{ vars.IMAGE_SERVICE_URL }}
32+
IMAGE_SERVICE_AUTH0_DOMAIN: ${{ vars.IMAGE_SERVICE_AUTH0_DOMAIN }}
33+
IMAGE_SERVICE_AUTH0_AUDIENCE: ${{ vars.IMAGE_SERVICE_AUTH0_AUDIENCE }}
34+
IMAGE_SERVICE_M2M_CLIENT_ID: ${{ vars.IMAGE_SERVICE_M2M_CLIENT_ID }}
35+
# FastComments (discussion)
36+
FASTCOMMENTS_TENANT_ID: ${{ vars.FASTCOMMENTS_TENANT_ID }}
37+
FASTCOMMENTS_ENABLED: ${{ vars.FASTCOMMENTS_ENABLED }}
38+
COMMENTS_SITE_KEY: ${{ vars.COMMENTS_SITE_KEY }}
3139
# Secrets
3240
AUTH0_CLIENT_SECRET: ${{ secrets.AUTH0_CLIENT_SECRET }}
3341
AUTH_COOKIE_SECRET: ${{ secrets.AUTH_COOKIE_SECRET }}
3442
MPS_API_KEY: ${{ secrets.MPS_API_KEY }}
43+
IMAGE_SERVICE_M2M_CLIENT_SECRET: ${{ secrets.IMAGE_SERVICE_M2M_CLIENT_SECRET }}
44+
FASTCOMMENTS_API_SECRET: ${{ secrets.FASTCOMMENTS_API_SECRET }}
3545

3646
jobs:
3747
deploy:
@@ -102,8 +112,15 @@ jobs:
102112
--set-env-vars AUTH_POST_LOGIN_REDIRECT=${{ env.AUTH_POST_LOGIN_REDIRECT }}
103113
--set-env-vars MPS_API_KEY=${{ env.MPS_API_KEY }}
104114
--set-env-vars LATEST_SPEC_VERSION=${{ env.LATEST_SPEC_VERSION }}
105-
115+
--set-env-vars IMAGE_SERVICE_URL=${{ env.IMAGE_SERVICE_URL }}
116+
--set-env-vars IMAGE_SERVICE_AUTH0_DOMAIN=${{ env.IMAGE_SERVICE_AUTH0_DOMAIN }}
117+
--set-env-vars IMAGE_SERVICE_AUTH0_AUDIENCE=${{ env.IMAGE_SERVICE_AUTH0_AUDIENCE }}
118+
--set-env-vars IMAGE_SERVICE_M2M_CLIENT_ID=${{ env.IMAGE_SERVICE_M2M_CLIENT_ID }}
119+
--set-env-vars IMAGE_SERVICE_M2M_CLIENT_SECRET=${{ env.IMAGE_SERVICE_M2M_CLIENT_SECRET }}
120+
--set-env-vars FASTCOMMENTS_TENANT_ID=${{ env.FASTCOMMENTS_TENANT_ID }}
121+
--set-env-vars FASTCOMMENTS_ENABLED=${{ env.FASTCOMMENTS_ENABLED }}
122+
--set-env-vars FASTCOMMENTS_API_SECRET=${{ env.FASTCOMMENTS_API_SECRET }}
123+
--set-env-vars COMMENTS_SITE_KEY=${{ env.COMMENTS_SITE_KEY }}
106124
107125
- name: Output URL
108126
run: echo "Deployed to ${{ steps.deploy.outputs.url }}"
109-

‎Dockerfile‎

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,19 @@
11
FROM us-central1-docker.pkg.dev/specautomation-458709/microsites/microsites-base:dev
2-
ARG ASTRO_BASE_PATH=/openbadges/
3-
ENV ASTRO_BASE_PATH=/openbadges/
2+
ARG ASTRO_BASE_PATH=/open-badges/
3+
ENV ASTRO_BASE_PATH=/open-badges/
4+
ENV MICROSITE_CONTENT_ROOT=/app/content
45

5-
# This clears some test upstream content bundled in the base image, preserving content.config.ts
6-
RUN if [ -f /app/src/content/content.config.ts ]; then \
7-
cp /app/src/content/content.config.ts /tmp/content.config.ts; \
8-
fi && \
9-
rm -rf /app/src/content && \
10-
mkdir -p /app/src/content/standards && \
11-
if [ -f /tmp/content.config.ts ]; then \
12-
cp /tmp/content.config.ts /app/src/content/content.config.ts; \
13-
rm /tmp/content.config.ts; \
14-
fi
6+
# Remove bundled upstream example content (mdexamples, diagram-examples, etc.)
7+
RUN rm -rf /app/content/docs
158

16-
17-
COPY --chown=astro:nodejs ob_v3p0/microsites /app/src/content/standards/
18-
COPY --chown=astro:nodejs .microsite /app/src/content/
9+
COPY --chown=astro:nodejs ob_v3p0/microsites /app/content/docs/standards/
10+
COPY --chown=astro:nodejs .microsite /app/content/.microsite
1911

2012
# ACE Extension
21-
COPY --chown=astro:nodejs extensions/aceExtension/v1p0/microsite /app/src/content/standards/ob-ace
13+
COPY --chown=astro:nodejs extensions/aceExtension/v1p0/microsite /app/content/docs/standards/ob-ace
2214

2315
# Assessment Extension
24-
COPY --chown=astro:nodejs extensions/assessmentExtension/v2p0/microsite /app/src/content/standards/ob-assessment
16+
COPY --chown=astro:nodejs extensions/assessmentExtension/v2p0/microsite /app/content/docs/standards/ob-assessment
2517

2618
# Issuer Accreditation Extension
27-
COPY --chown=astro:nodejs extensions/issuerAccreditationExtension/v2p0/microsite /app/src/content/standards/ob-accred
28-
29-
# The base image handles everything:
30-
# 1. Runtime processes the assets (transforms paths, copies assets)
31-
# 2. Starts the Astro server
32-
# No additional commands needed!
19+
COPY --chown=astro:nodejs extensions/issuerAccreditationExtension/v2p0/microsite /app/content/docs/standards/ob-accred

‎docker-compose.yml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
services:
2+
image-service:
3+
image: us-central1-docker.pkg.dev/specautomation-458709/microsites/microsites-image-service:dev
4+
platform: linux/amd64
5+
container_name: ob-image-service-dev
6+
ports:
7+
- "8080:8080"
8+
environment:
9+
NODE_ENV: development
10+
IN_DOCKER: "true"
11+
IMAGE_SERVICE_AUTH_DISABLED: "true"
12+
CACHE_DIR: /cache
13+
CACHE_PUBLIC_HOST: http://image-service:8080
14+
volumes:
15+
- diagram-cache:/cache
16+
17+
web:
18+
build:
19+
context: .
20+
dockerfile: Dockerfile
21+
args:
22+
ASTRO_BASE_PATH: "/open-badges/"
23+
platform: linux/amd64
24+
image: ob-microsite:local
25+
container_name: ob-microsite-dev
26+
ports:
27+
- "4321:4321"
28+
depends_on:
29+
- image-service
30+
environment:
31+
NODE_ENV: development
32+
IN_DOCKER: "true"
33+
ASTRO_BASE_PATH: "/open-badges/"
34+
MICROSITE_CONTENT_ROOT: "/app/content"
35+
DISABLE_AUTH: "true"
36+
HOST: "0.0.0.0"
37+
IMAGE_SERVICE_URL: http://image-service:8080
38+
IMAGE_SERVICE_AUTH_DISABLED: "true"
39+
LATEST_SPEC_VERSION: "v3p0"
40+
# Optional: uncomment and set for MPS blocks or FastComments local testing
41+
# MPS_API_KEY: ""
42+
# MPS_HOST: "https://mps.1edtech.org"
43+
# FASTCOMMENTS_TENANT_ID: ""
44+
# FASTCOMMENTS_ENABLED: "true"
45+
# COMMENTS_SITE_KEY: "open-badges"
46+
47+
volumes:
48+
diagram-cache:

‎extensions/aceExtension/v1p0/microsite/v1p0.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ author: 1Edtech Consortium
33
category: Extension
44
title: Open Badges American Council for Education (ACE) Extension
55
shortcode: OB-ACE-10
6-
status: Candidate Final Public
6+
status: PublicCandidateFinal
77
lastUpdated: 2025-10-09
88
version: '1.0'
99
nature: normative

‎extensions/assessmentExtension/v2p0/microsite/v2p0.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ author: 1Edtech Consortium
33
category: Extension
44
title: Open Badges Assessment Extension
55
shortcode: OB-ASSESSMENT-20
6-
status: Candidate Final Public
6+
status: PublicCandidateFinal
77
lastUpdated: 2025-07-08
88
version: '2.0'
99
nature: normative
10-
docType: spec
10+
docType: specification
1111
contributors:
1212
- name: Nate Otto
1313
affiliation: Skybridge Skills

‎extensions/issuerAccreditationExtension/v2p0/microsite/v2p0.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ author: 1Edtech Consortium
33
category: Extension
44
title: Open Badges Issuer Accreditation Extension
55
shortcode: OB-ACCRED-20
6-
status: Base Document
6+
status: Final
77
lastUpdated: 2024-07-24
88
version: '2.0'
99
nature: normative
10-
docType: spec
10+
docType: specification
1111
contributors:
1212
- name: Nate Otto
1313
affiliation: Skybridge Skills

‎ob_v3p0/microsites/v3p0.md‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ category: Specification
44
title: Open Badges Specification
55
shortcode: OB-30
66
status: Final
7-
lastUpdated: November 6, 2025
7+
lastUpdated: 2025-11-06
88
version: '3.0'
99
nature: normative
1010
docType: specification
@@ -104,117 +104,117 @@ contributors:
104104
role: Editor
105105
ipDisclosures:
106106
- organization: Concentric Sky
107-
date: October 24, 2019
107+
date: 2019-10-24
108108
claim: false
109109
type: RF RAND (Required & Optional Elements)
110110
- organization: Arizona State University
111-
date: June 21, 2022
111+
date: 2022-06-21
112112
claim: false
113113
type: RF RAND (Required & Optional Elements)
114114
- organization: Temple University
115-
date: June 10, 2022
115+
date: 2022-06-10
116116
claim: false
117117
type: RF RAND (Required & Optional Elements)
118118
- organization: Credly
119-
date: October 3, 2019
119+
date: 2019-10-03
120120
claim: false
121121
type: RF RAND (Required & Optional Elements)
122122
- organization: Workday, Inc.
123-
date: June 10, 2022
123+
date: 2022-06-10
124124
claim: false
125125
type: RF RAND (Required & Optional Elements)
126126
- organization: RANDA Solutions
127-
date: June 9, 2022
127+
date: 2022-06-09
128128
claim: false
129129
type: RF RAND (Required & Optional Elements)
130130
- organization: Anthology
131-
date: April 16, 2024
131+
date: 2024-04-16
132132
claim: false
133133
type: RF RAND (Required & Optional Elements)
134134
- organization: Unicon
135-
date: April 22, 2024
135+
date: 2024-04-22
136136
claim: false
137137
type: RF RAND (Required & Optional Elements)
138138
- organization: Bowdoin College
139-
date: June 11, 2022
139+
date: 2022-06-11
140140
claim: false
141141
type: RF RAND (Required & Optional Elements)
142142
- organization: American Association of Collegiate Registrars and Admissions Officers (AACARO)
143-
date: April 15, 2024
143+
date: 2024-04-15
144144
claim: false
145145
type: RF RAND (Required & Optional Elements)
146146
- organization: Desire to Learn (D2L)
147-
date: April 16, 2024
147+
date: 2024-04-16
148148
claim: false
149149
type: RF RAND (Required & Optional Elements)
150150
- organization: Digital Knowledge EdTech Lab Inc.
151-
date: April 24, 2024
151+
date: 2024-04-24
152152
claim: false
153153
type: RF RAND (Required & Optional Elements)
154154
- organization: IQC Italian Quality Company
155-
date: April 19, 2024
155+
date: 2024-04-19
156156
claim: false
157157
type: RF RAND (Required & Optional Elements)
158158
- organization: Skybridge Skills
159-
date: April 16, 2024
159+
date: 2024-04-16
160160
claim: false
161161
type: RF RAND (Required & Optional Elements)
162162
- organization: Navigatr
163-
date: April 25, 2024
163+
date: 2024-04-25
164164
claim: false
165165
type: RF RAND (Required & Optional Elements)
166166
- organization: T3 Innovation Network, US Chamber of Commerce Foundation
167-
date: April 25, 2024
167+
date: 2024-04-25
168168
claim: false
169169
type: RF RAND (Required & Optional Elements)
170170
- organization: Territorium
171-
date: April 23, 2024
171+
date: 2024-04-23
172172
claim: false
173173
type: RF RAND (Required & Optional Elements)
174174
- organization: 'Western Governors University (WGU) '
175-
date: June 11, 2022
175+
date: 2022-06-11
176176
claim: false
177177
type: RF RAND (Required & Optional Elements)
178178
releases:
179179
- version: "Candidate Final"
180180
docVersion: "1.0"
181-
date: 2022/07/14
181+
date: 2022-07-14
182182
comments: "Open Badges 3.0 first Candidate Final release"
183183
- version: "Candidate Public Final"
184184
docVersion: "1.0.1"
185-
date: 2023/02/09
185+
date: 2023-02-09
186186
comments: "Open Badges 3.0 first Candidate Public Final release"
187187
- version: "Final"
188188
docVersion: "1.0"
189-
date: 2024/05/27
189+
date: 2024-05-27
190190
comments: "Open Badges 3.0 Final Release"
191191
- version: "Final"
192192
docVersion: "1.1"
193-
date: 2024/07/26
193+
date: 2024-07-26
194194
comments: "Fixed some typos. See [[OB-ERRATA-30]]\nAdded [[VC-DATA-MODEL-1.1]] compatible JSON schema in Document Set"
195195
- version: "Final"
196196
docVersion: "1.2"
197-
date: 2024/12/23
197+
date: 2024-12-23
198198
comments: "Clarified proof mechanism and algorithm selection. See [[OB-ERRATA-30]]"
199199
- version: "Final"
200200
docVersion: "1.3"
201-
date: 2025/10/09
201+
date: 2025-10-09
202202
comments: "Updated JSON Schemas with support for [[JSON-LD11-API]] compaction process\nDeprecated [[VCRL-10]] in favour of [[vc-bitstring-status-list]]"
203203
- version: "Final"
204204
docVersion: "1.4"
205-
date: 2025/10/14
205+
date: 2025-10-14
206206
comments: "Credential Status' id is an optional field as defined at [[vc-data-model-2.0]]"
207207
- version: "Final"
208208
docVersion: "1.4.1"
209-
date: 2025/11/06
209+
date: 2025-11-06
210210
comments: "Updated JSON-LD Context, adding the term `jti`"
211211
- version: "Final"
212212
docVersion: "1.4.2"
213-
date: 2026/04/17
213+
date: 2026-04-17
214214
comments: "Updated <code>CredentialStatus</code> of all examples to <code>BitstringStatusListEntry</code>"
215215
- version: "Final"
216216
docVersion: "1.4.3"
217-
date: 2026/04/22
217+
date: 2026-04-22
218218
comments: "Fixed links to OpenAPI files in <a href=\"#api\">Open Badges API</a> section"
219219
---
220220

0 commit comments

Comments
 (0)