fix: handle branches with / in name

specify · Jan 23, 2024 · dd5fcd7 · dd5fcd7
1 parent b5d6934
commit dd5fcd7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/lib/dockerCompose.ts b/app/lib/dockerCompose.ts
@@ -1,10 +1,14 @@
 import type { ActiveDeployment, Deployment } from './deployment';
 import type { RA } from './typescriptCommonTypes';
 
+// As per https://github.com/specify/specify7/blob/e52a2c09d41aa65f623f2bd73126dd594f5d9522/.github/workflows/docker.yml#L30
+export const branchToTag = (branch: string) => branch.replaceAll('/', '-');
+export const tagToBranch = (branch: string) => branch.replaceAll('-', '/');
+
 const resolveVersion = (deployment: Deployment) =>
   typeof deployment.digest === 'string'
     ? `@${deployment.digest}`
-    : `:${deployment.branch}`;
+    : `:${branchToTag(deployment.branch)}`;
 
 export const createDockerConfig = (
   deployments: RA<ActiveDeployment>,

diff --git a/app/pages/api/dockerhub/[image].ts b/app/pages/api/dockerhub/[image].ts
@@ -1,6 +1,7 @@
 import type { NextApiRequest, NextApiResponse } from 'next';
 
 import type { IR, RA } from '../../../lib/typescriptCommonTypes';
+import { tagToBranch } from '../../../lib/dockerCompose';
 
 export type DockerHubTag = {
   readonly lastUpdated: string;
@@ -36,7 +37,7 @@ const processTagsResponse = (tags: Response['results']): IR<DockerHubTag> =>
     tags
       .filter(({ name }) => !name.startsWith('sha-'))
       .map(({ name, last_updated, digest }) => [
-        name,
+        tagToBranch(name),
         {
           lastUpdated: last_updated,
           digest,