Parameterize the emacs and org-mode versions in the dockerfiles.
This commit is contained in:
		
							parent
							
								
									fc79507ef3
								
							
						
					
					
						commit
						77348b560c
					
				| @ -1,11 +1,10 @@ | |||||||
| FROM alpine:3.17 AS build | FROM alpine:3.17 AS build | ||||||
| 
 |  | ||||||
| RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev ncurses-dev gawk | RUN apk add --no-cache build-base musl-dev git autoconf make texinfo gnutls-dev ncurses-dev gawk | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| FROM build AS build-emacs | FROM build AS build-emacs | ||||||
| 
 | ARG EMACS_VERSION=emacs-29.1 | ||||||
| RUN git clone --depth 1 --branch emacs-29.1 https://git.savannah.gnu.org/git/emacs.git /root/emacs | RUN git clone --depth 1 --branch $EMACS_VERSION https://git.savannah.gnu.org/git/emacs.git /root/emacs | ||||||
| WORKDIR /root/emacs | WORKDIR /root/emacs | ||||||
| RUN mkdir /root/dist | RUN mkdir /root/dist | ||||||
| RUN ./autogen.sh | RUN ./autogen.sh | ||||||
| @ -15,9 +14,12 @@ RUN make DESTDIR="/root/dist" install | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| FROM build AS build-org-mode | FROM build AS build-org-mode | ||||||
|  | ARG ORG_VERSION=299193bf091a63474fc8036bd31de51800a2555a | ||||||
| COPY --from=build-emacs /root/dist/ / | COPY --from=build-emacs /root/dist/ / | ||||||
| RUN mkdir /root/dist | RUN mkdir /root/dist | ||||||
| RUN mkdir /root/org-mode && git -C /root/org-mode init --initial-branch=main && git -C /root/org-mode remote add origin https://git.savannah.gnu.org/git/emacs/org-mode.git && git -C /root/org-mode fetch origin 299193bf091a63474fc8036bd31de51800a2555a && git -C /root/org-mode checkout FETCH_HEAD | # Savannah does not allow fetching specific revisions, so we're going to have to put unnecessary load on their server by cloning main and then checking out the revision we want. | ||||||
|  | RUN git clone https://git.savannah.gnu.org/git/emacs/org-mode.git /root/org-mode && git -C /root/org-mode checkout $ORG_VERSION | ||||||
|  | # RUN mkdir /root/org-mode && git -C /root/org-mode init --initial-branch=main && git -C /root/org-mode remote add origin https://git.savannah.gnu.org/git/emacs/org-mode.git && git -C /root/org-mode fetch origin $ORG_VERSION && git -C /root/org-mode checkout FETCH_HEAD | ||||||
| WORKDIR /root/org-mode | WORKDIR /root/org-mode | ||||||
| RUN make compile | RUN make compile | ||||||
| RUN make DESTDIR="/root/dist" install | RUN make DESTDIR="/root/dist" install | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Tom Alexander
						Tom Alexander