Commit c3628e0

committed

Merge branch '479-se-container-registry' into 'master'

chore: replace path of the Docker registry with SE images (#479) Closes #479 See merge request postgres-ai/database-lab!667

2 parents 4e22396 + a0756ae commit c3628e0Copy full SHA for c3628e0

File tree

-6

lines changed

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ WORKDIR /app`
`5`	`5`
`6`	`6`	`COPY ./ui/ .`
`7`	`7`
`8`		`-RUN --mount=type=bind,id=pnpm,source=.pnpm-store,target=/app/.pnpm-store`
	`8`	`+#RUN --mount=type=bind,id=pnpm,source=.pnpm-store,target=/app/.pnpm-store`
`9`	`9`
`10`	`10`	`ARG API_URL_PREFIX`
`11`	`11`	`ENV REACT_APP_API_URL_PREFIX ${API_URL_PREFIX}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ WORKDIR /app`
`12`	`12`
`13`	`13`	`COPY ./ui/ .`
`14`	`14`
`15`		`-RUN --mount=type=bind,id=pnpm,source=.pnpm-store,target=/app/.pnpm-store`
	`15`	`+#RUN --mount=type=bind,id=pnpm,source=.pnpm-store,target=/app/.pnpm-store`
`16`	`16`
`17`	`17`	`ARG ARG_REACT_APP_API_SERVER`
`18`	`18`	`ENV REACT_APP_API_SERVER=$ARG_REACT_APP_API_SERVER`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { DatabaseType } from '@postgres.ai/shared/types/api/entities/config'`
`3`	`3`	`import { dockerImageOptions } from '../configOptions'`
`4`	`4`	`import { FormValues } from '../useForm'`
`5`	`5`
`6`		`-const extendedCustomImage = 'custom-images/extended-postgres'`
	`6`	`+const seContainerRegistry = 'se-images'`
`7`	`7`	`// used for creating an array for postgresImages, should be incremented if a new version comes out`
`8`	`8`	`const versionArrayLength = 7`
`9`	`9`
`@@ -53,7 +53,7 @@ export const formatDockerImageArray = (type: string) => {`
`53`	`53`	`} else {`
`54`	`54`	`images = versions.map(`
`55`	`55`	`(version) =>`
`56`		- `registry.gitlab.com/postgres-ai/${extendedCustomImage}-${type}:${version}`,
	`56`	+ `registry.gitlab.com/postgres-ai/${seContainerRegistry}/${type}:${version}`,
`57`	`57`	`)`
`58`	`58`	`}`
`59`	`59`
`@@ -62,8 +62,8 @@ export const formatDockerImageArray = (type: string) => {`
`62`	`62`
`63`	`63`	`export const getImageType = (imageUrl: string) => {`
`64`	`64`	`const postgresCustomImageType =`
`65`		`- imageUrl.includes(extendedCustomImage) &&`
`66`		- imageUrl.split(`${extendedCustomImage}-`)[1]?.split(':')[0]
	`65`	`+ imageUrl.includes(seContainerRegistry) &&`
	`66`	+ imageUrl.split(`${seContainerRegistry}/`)[1]?.split(':')[0]
`67`	`67`
`68`	`68`	`const formattedDockerImageArray = formatDockerImageArray(`
`69`	`69`	`postgresCustomImageType \|\| '',`

Comments

(0)