mirror of
				https://github.com/TeamPiped/Piped-Backend.git
				synced 2024-08-14 23:51:41 +00:00 
			
		
		
		
	Merge pull request #720 from TeamPiped/21-temurin
Re-enable eclipse temurin docker builds.
This commit is contained in:
		
						commit
						ea6da3736b
					
				
					 4 changed files with 6 additions and 6 deletions
				
			
		
							
								
								
									
										2
									
								
								.github/workflows/docker-build-test.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/docker-build-test.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -22,7 +22,7 @@ jobs:
 | 
			
		|||
          - testing/docker-compose.cockroachdb.yml
 | 
			
		||||
          - testing/docker-compose.yugabytedb.yml
 | 
			
		||||
        dockerfile:
 | 
			
		||||
          #- Dockerfile.ci
 | 
			
		||||
          - Dockerfile.ci
 | 
			
		||||
          - Dockerfile.azul.ci
 | 
			
		||||
          #- Dockerfile.openj9.ci
 | 
			
		||||
          - Dockerfile.graalvm-jvm.ci
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								.github/workflows/docker-build.yml
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/docker-build.yml
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -19,8 +19,8 @@ jobs:
 | 
			
		|||
        include:
 | 
			
		||||
#          - image: 1337kavin/piped:openj9
 | 
			
		||||
#            dockerfile: ./Dockerfile.openj9.ci
 | 
			
		||||
#          - image: 1337kavin/piped:hotspot
 | 
			
		||||
#            dockerfile: ./Dockerfile.ci
 | 
			
		||||
          - image: 1337kavin/piped:hotspot
 | 
			
		||||
            dockerfile: ./Dockerfile.ci
 | 
			
		||||
          - image: 1337kavin/piped:latest,1337kavin/piped:azul-zulu
 | 
			
		||||
            dockerfile: ./Dockerfile.azul.ci
 | 
			
		||||
          - image: 1337kavin/piped:graalvm-jvm
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
FROM eclipse-temurin:17-jdk AS build
 | 
			
		||||
FROM eclipse-temurin:21-jdk AS build
 | 
			
		||||
 | 
			
		||||
WORKDIR /app/
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -7,7 +7,7 @@ COPY . /app/
 | 
			
		|||
RUN --mount=type=cache,target=/root/.gradle/caches/ \
 | 
			
		||||
 ./gradlew shadowJar
 | 
			
		||||
 | 
			
		||||
FROM eclipse-temurin:17-jre
 | 
			
		||||
FROM eclipse-temurin:21-jre
 | 
			
		||||
 | 
			
		||||
RUN --mount=type=cache,target=/var/cache/apt/ \
 | 
			
		||||
 apt-get update && \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
FROM eclipse-temurin:17-jre
 | 
			
		||||
FROM eclipse-temurin:21-jre
 | 
			
		||||
 | 
			
		||||
RUN --mount=type=cache,target=/var/cache/apt/ \
 | 
			
		||||
 apt-get update && \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue