use sensible docker build arg defaults
This commit is contained in:
		
							parent
							
								
									6f66755871
								
							
						
					
					
						commit
						044fd3c71a
					
				@ -7,9 +7,9 @@ RUN corepack enable
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
FROM deps AS build
 | 
			
		||||
ARG NEXT_PUBLIC_SITE_URL=foo
 | 
			
		||||
ARG NEXT_PUBLIC_STRAPI_URL=foo
 | 
			
		||||
ARG NEXT_PUBLIC_UPPY_COMPANION_URL=foo
 | 
			
		||||
ARG NEXT_PUBLIC_SITE_URL=https://futureporn.net
 | 
			
		||||
ARG NEXT_PUBLIC_STRAPI_URL=https://portal.futureporn.net
 | 
			
		||||
ARG NEXT_PUBLIC_UPPY_COMPANION_URL=https://uppy.futureporn.net
 | 
			
		||||
ENV NEXT_PUBLIC_SITE_URL ${NEXT_PUBLIC_SITE_URL}
 | 
			
		||||
ENV NEXT_PUBLIC_STRAPI_URL ${NEXT_PUBLIC_STRAPI_URL}
 | 
			
		||||
ENV NEXT_PUBLIC_UPPY_COMPANION_URL ${NEXT_PUBLIC_UPPY_COMPANION_URL}
 | 
			
		||||
@ -28,5 +28,5 @@ CMD ["pnpm", "run", "dev"]
 | 
			
		||||
 | 
			
		||||
FROM deps AS next
 | 
			
		||||
WORKDIR /app
 | 
			
		||||
COPY --from=build /usr/src/app /app
 | 
			
		||||
COPY --from=build /app /app
 | 
			
		||||
CMD ["pnpm", "start"]
 | 
			
		||||
@ -6,6 +6,7 @@
 | 
			
		||||
  "scripts": {
 | 
			
		||||
    "test": "echo \"Error: no test specified\" && exit 1",
 | 
			
		||||
    "kompose": "kompose convert --file compose.yml -c --out ./charts",
 | 
			
		||||
    "build:next": "docker build --build-arg=\"NEXT_PUBLIC_SITE_URL=https://futureporn.net\" --build-arg=\"NEXT_PUBLIC_STRAPI_URL=https://portal.futureporn.net\" --build-arg=\"NEXT_PUBLIC_UPPY_COMPANION_URL=https://uppy.futureporn.net\" -t fp-next:latest -f ./next.Dockerfile .",
 | 
			
		||||
    "deploy:bot": "echo @todo",
 | 
			
		||||
    "deploy:next": "git push origin:next main",
 | 
			
		||||
    "deploy:link2cid": "echo @todo",
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										41
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										41
									
								
								pnpm-lock.yaml
									
									
									
										generated
									
									
									
								
							@ -6,6 +6,8 @@ settings:
 | 
			
		||||
 | 
			
		||||
importers:
 | 
			
		||||
 | 
			
		||||
  .: {}
 | 
			
		||||
 | 
			
		||||
  packages/bot:
 | 
			
		||||
    dependencies:
 | 
			
		||||
      '@types/express':
 | 
			
		||||
@ -28,6 +30,37 @@ importers:
 | 
			
		||||
        specifier: ^4.7.0
 | 
			
		||||
        version: 4.7.0
 | 
			
		||||
 | 
			
		||||
  packages/link2cid:
 | 
			
		||||
    dependencies:
 | 
			
		||||
      '@types/express':
 | 
			
		||||
        specifier: ^4.17.21
 | 
			
		||||
        version: 4.17.21
 | 
			
		||||
      body-parser:
 | 
			
		||||
        specifier: ^1.20.2
 | 
			
		||||
        version: 1.20.2
 | 
			
		||||
      cors:
 | 
			
		||||
        specifier: ^2.8.5
 | 
			
		||||
        version: 2.8.5
 | 
			
		||||
      date-fns:
 | 
			
		||||
        specifier: ^3.0.5
 | 
			
		||||
        version: 3.3.1
 | 
			
		||||
      dotenv:
 | 
			
		||||
        specifier: ^16.3.1
 | 
			
		||||
        version: 16.3.1
 | 
			
		||||
      express:
 | 
			
		||||
        specifier: ^4.18.2
 | 
			
		||||
        version: 4.18.2
 | 
			
		||||
      jsonwebtoken:
 | 
			
		||||
        specifier: ^9.0.2
 | 
			
		||||
        version: 9.0.2
 | 
			
		||||
      ssestream:
 | 
			
		||||
        specifier: ^1.1.0
 | 
			
		||||
        version: 1.1.0
 | 
			
		||||
    devDependencies:
 | 
			
		||||
      nodemon:
 | 
			
		||||
        specifier: ^3.0.3
 | 
			
		||||
        version: 3.0.3
 | 
			
		||||
 | 
			
		||||
  packages/next:
 | 
			
		||||
    dependencies:
 | 
			
		||||
      '@fortawesome/fontawesome-free':
 | 
			
		||||
@ -3535,6 +3568,10 @@ packages:
 | 
			
		||||
      '@babel/runtime': 7.23.8
 | 
			
		||||
    dev: false
 | 
			
		||||
 | 
			
		||||
  /date-fns@3.3.1:
 | 
			
		||||
    resolution: {integrity: sha512-y8e109LYGgoQDveiEBD3DYXKba1jWf5BA8YU1FL5Tvm0BTdEfy54WLCwnuYWZNnzzvALy/QQ4Hov+Q9RVRv+Zw==}
 | 
			
		||||
    dev: false
 | 
			
		||||
 | 
			
		||||
  /dayjs@1.11.10:
 | 
			
		||||
    resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
 | 
			
		||||
    dev: false
 | 
			
		||||
@ -6447,6 +6484,10 @@ packages:
 | 
			
		||||
    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 | 
			
		||||
    dev: false
 | 
			
		||||
 | 
			
		||||
  /ssestream@1.1.0:
 | 
			
		||||
    resolution: {integrity: sha512-UOS3JTuGqGEOH89mfHFwVOJNH2+JX9ebIWuw6WBQXpkVOxbdoY3RMliSHzshL4XVYJJrcul5NkuvDFCzgYu1Lw==}
 | 
			
		||||
    dev: false
 | 
			
		||||
 | 
			
		||||
  /statuses@2.0.1:
 | 
			
		||||
    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
 | 
			
		||||
    engines: {node: '>= 0.8'}
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user