Updates to move to Ubuntu -- try this, no musl.
This commit is contained in:
		
							parent
							
								
									8a2584f851
								
							
						
					
					
						commit
						8c8f97a5c4
					
				
					 2 changed files with 15 additions and 5 deletions
				
			
		|  | @ -1,4 +1,4 @@ | ||||||
| FROM docker.io/library/eclipse-temurin:21-jdk-alpine | FROM docker.io/library/eclipse-temurin:21-jdk | ||||||
| 
 | 
 | ||||||
| ARG SCALA_VERSION | ARG SCALA_VERSION | ||||||
| ENV SCALA_VERSION ${SCALA_VERSION:-3.4.0} | ENV SCALA_VERSION ${SCALA_VERSION:-3.4.0} | ||||||
|  | @ -8,12 +8,18 @@ ENV SBT_VERSION ${SBT_VERSION:-1.9.9} | ||||||
| # git is required for checkout | # git is required for checkout | ||||||
| # python3 is required for pre-commit | # python3 is required for pre-commit | ||||||
| # node is required for Forgejo checkout | # node is required for Forgejo checkout | ||||||
| RUN apk add curl bash git docker python3 py3-pip nodejs npm | #RUN apk add curl bash git docker python3 py3-pip nodejs npm | ||||||
| RUN pip3 install pre-commit --break-system-packages | RUN apt-get update | ||||||
|  | RUN apt-get install -y curl git docker python3 python3-pip nodejs | ||||||
|  | 
 | ||||||
|  | # On Alpine, must include --break-system-packages | ||||||
|  | RUN pip3 install pre-commit #--break-system-packages | ||||||
| 
 | 
 | ||||||
| # Create the user - builds do not run as root. | # Create the user - builds do not run as root. | ||||||
| RUN addgroup -S -g 1000 builder | #RUN addgroup -S -g 1000 builder | ||||||
| RUN adduser -S -h /home/builder -s /bin/bash -G builder -u 1000 builder | #RUN adduser -S -h /home/builder -s /bin/bash -G builder -u 1000 builder | ||||||
|  | RUN groupadd -g 1111 -r builder | ||||||
|  | RUN useradd -u 1111 -m -g 1111 -r builder | ||||||
| 
 | 
 | ||||||
| # Switch to the build user. Everything else is installed at this level. | # Switch to the build user. Everything else is installed at this level. | ||||||
| USER builder | USER builder | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								build-and-run
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										4
									
								
								build-and-run
									
										
									
									
									
										Executable file
									
								
							|  | @ -0,0 +1,4 @@ | ||||||
|  | #!/bin/sh | ||||||
|  | 
 | ||||||
|  | podman build --tag registry.garrity.co:8443/gs/ci-scala:latest . | ||||||
|  | podman run --rm -it --entrypoint bash registry.garrity.co:8443/gs/ci-scala:latest | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue