Update to Alpine 3.18 (#24700)
This pull request is for updating the base docker images to build with the latest version of Alpine.
This commit is contained in:
		
							parent
							
								
									61ad4c607b
								
							
						
					
					
						commit
						bed6885448
					
				| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
#Build stage
 | 
					#Build stage
 | 
				
			||||||
FROM docker.io/library/golang:1.20-alpine3.17 AS build-env
 | 
					FROM docker.io/library/golang:1.20-alpine3.18 AS build-env
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG GOPROXY
 | 
					ARG GOPROXY
 | 
				
			||||||
ENV GOPROXY ${GOPROXY:-direct}
 | 
					ENV GOPROXY ${GOPROXY:-direct}
 | 
				
			||||||
| 
						 | 
					@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 | 
				
			||||||
# Begin env-to-ini build
 | 
					# Begin env-to-ini build
 | 
				
			||||||
RUN go build contrib/environment-to-ini/environment-to-ini.go
 | 
					RUN go build contrib/environment-to-ini/environment-to-ini.go
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM docker.io/library/alpine:3.17
 | 
					FROM docker.io/library/alpine:3.18
 | 
				
			||||||
LABEL maintainer="maintainers@gitea.io"
 | 
					LABEL maintainer="maintainers@gitea.io"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
EXPOSE 22 3000
 | 
					EXPOSE 22 3000
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
#Build stage
 | 
					#Build stage
 | 
				
			||||||
FROM docker.io/library/golang:1.20-alpine3.17 AS build-env
 | 
					FROM docker.io/library/golang:1.20-alpine3.18 AS build-env
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ARG GOPROXY
 | 
					ARG GOPROXY
 | 
				
			||||||
ENV GOPROXY ${GOPROXY:-direct}
 | 
					ENV GOPROXY ${GOPROXY:-direct}
 | 
				
			||||||
| 
						 | 
					@ -23,7 +23,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \
 | 
				
			||||||
# Begin env-to-ini build
 | 
					# Begin env-to-ini build
 | 
				
			||||||
RUN go build contrib/environment-to-ini/environment-to-ini.go
 | 
					RUN go build contrib/environment-to-ini/environment-to-ini.go
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FROM docker.io/library/alpine:3.17
 | 
					FROM docker.io/library/alpine:3.18
 | 
				
			||||||
LABEL maintainer="maintainers@gitea.io"
 | 
					LABEL maintainer="maintainers@gitea.io"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
EXPOSE 2222 3000
 | 
					EXPOSE 2222 3000
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue