Better file names

r-hub · Dec 18, 2023 · 9c76cff · 9c76cff
1 parent e7e5f77
commit 9c76cff
Show file tree

Hide file tree

Showing 32 changed files with 41 additions and 41 deletions.
diff --git a/.github/workflows/build-bookworm.yaml b/.github/workflows/build-bookworm.yaml
@@ -23,7 +23,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/bookworm-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-bookworm.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/build-etch.yaml b/.github/workflows/build-etch.yaml
@@ -23,7 +23,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/etch-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-etch.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/build-lenny.yaml b/.github/workflows/build-lenny.yaml
@@ -23,7 +23,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/lenny-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-lenny.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/build-sarge.yaml b/.github/workflows/build-sarge.yaml
@@ -10,7 +10,7 @@ on:
  type: string
 
 jobs:
- 
+
  setup-matrix:
  runs-on: ubuntu-latest
  outputs:
@@ -23,7 +23,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/prerelease-versions.txt containers/sarge-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-prerelease.txt containers/versions-sarge.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/build-squeeze.yaml b/.github/workflows/build-squeeze.yaml
@@ -23,7 +23,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/squeeze-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-squeeze.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/deb-etch.yaml b/.github/workflows/deb-etch.yaml
@@ -22,7 +22,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/etch-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-etch.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/deb-lenny.yaml b/.github/workflows/deb-lenny.yaml
@@ -22,7 +22,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/lenny-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-lenny.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/deb-sarge.yaml b/.github/workflows/deb-sarge.yaml
@@ -22,7 +22,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/prerelease-versions.txt containers/sarge-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-prerelease.txt containers/versions-sarge.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/.github/workflows/deb-squeeze.yaml b/.github/workflows/deb-squeeze.yaml
@@ -22,7 +22,7 @@ jobs:
  run: |
  inp="${{ github.event.inputs.inpwhichcont }}"
  if [ "x$inp" == "xall" -o "x$inp" == "x" ]; then
- out="$(cat containers/squeeze-versions.txt | tr '\n' ',' | sed 's/,$//')"
+ out="$(cat containers/versions-squeeze.txt | tr '\n' ',' | sed 's/,$//')"
  else
  out=$inp
  fi

diff --git a/README.Rmd b/README.Rmd
@@ -248,34 +248,34 @@ For example to run R 0.65.1:
 ```{r, results = "asis", echo = FALSE}
 writeLines("| R version | Container | Platform | OS |")
 writeLines("|:----------|:----------|:---------|:---|")
-rv <- readLines("containers/prerelease-versions.txt")
+rv <- readLines("containers/versions-prerelease.txt")
 lab <- paste(rv, "(alpha)")
 lab[1] <- "0.0 (alpha-test)"
 writeLines(sprintf(
  "| R %s | `ghcr.io/r-hub/evercran/%s` | `linux/i386` | Debian Sarge 3.1 |",
  format(lab), format(rv)
 ))
-rv <- readLines("containers/sarge-versions.txt")
+rv <- readLines("containers/versions-sarge.txt")
 writeLines(sprintf(
  "| R %s | `ghcr.io/r-hub/evercran/%s` | `linux/i386` | Debian Sarge 3.1 |",
  format(rv), format(rv)
 ))
-rv <- readLines("containers/etch-versions.txt")
+rv <- readLines("containers/versions-etch.txt")
 writeLines(sprintf(
  "| R %s | `ghcr.io/r-hub/evercran/%s` | `linux/i386` | Debian Etch 4.0r9 |",
  format(rv), format(rv)
 ))
-rv <- readLines("containers/lenny-versions.txt")
+rv <- readLines("containers/versions-lenny.txt")
 writeLines(sprintf(
  "| R %s | `ghcr.io/r-hub/evercran/%s` | `linux/i386` | Debian Lenny 5.0.10 |",
  format(rv), format(rv)
 ))
-rv <- readLines("containers/squeeze-versions.txt")
+rv <- readLines("containers/versions-squeeze.txt")
 writeLines(sprintf(
  "| R %s | `ghcr.io/r-hub/evercran/%s` | `linux/i386` | Debian Squeeze 6.0.10 |",
  format(rv), format(rv)
 ))
-rv <- readLines("containers/bookworm-versions.txt")
+rv <- readLines("containers/versions-bookworm.txt")
 writeLines(sprintf(
  "| R %s | `ghcr.io/r-hub/evercran/%s` | `linux/amd64`, `linux/arm64`| Debian bookworm 12.1 |",
  format(rv), format(rv)

diff --git a/containers/Dockerfile-0.x b/containers/Dockerfile-0.x
@@ -8,21 +8,21 @@ ENV LESS=-r
 RUN echo 'deb http://ppa.r-pkg.org/evercran sarge main' \
  >> /etc/apt/sources.list
 
-COPY sarge-versions.txt .
+COPY versions-sarge.txt .
 
-RUN cat sarge-versions.txt | sed '/0\.49/,/1\.0\.0/!d;/1\.0\.0/q' > \
- 0x-versions.txt
+RUN cat versions-sarge.txt | sed '/0\.49/,/1\.0\.0/!d;/1\.0\.0/q' > \
+ versions-0x.txt
 
 RUN apt-get update && \
- apt-get install -y linux32 `cat 0x-versions.txt | sed 's/^/r-/'` && \
+ apt-get install -y linux32 `cat versions-0x.txt | sed 's/^/r-/'` && \
  apt-get clean && \
  rm -rf /var/lib/apt/lists/* && \
  mkdir -p /var/lib/apt/lists/partial && \
- rm sarge-versions.txt
+ rm versions-sarge.txt versions-0x.txt
 
 WORKDIR /root
 
-COPY sarge-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-sarge.sh /usr/local/bin/entrypoint.sh
 COPY inode64.so /usr/local/lib/inode64.so
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 

diff --git a/containers/Dockerfile-1.x b/containers/Dockerfile-1.x
@@ -8,21 +8,21 @@ ENV LESS=-r
 RUN echo 'deb http://ppa.r-pkg.org/evercran sarge main' \
  >> /etc/apt/sources.list
 
-COPY sarge-versions.txt .
+COPY versions-sarge.txt .
 
-RUN cat sarge-versions.txt | sed '/1\.0\.0/,/1\.9\.1/!d;/1\.9\.1/q' > \
- 1x-versions.txt
+RUN cat versions-sarge.txt | sed '/1\.0\.0/,/1\.9\.1/!d;/1\.9\.1/q' > \
+ versions-1x.txt
 
 RUN apt-get update && \
- apt-get install -y linux32 `cat 1x-versions.txt | sed 's/^/r-/'` && \
+ apt-get install -y linux32 `cat versions-1x.txt | sed 's/^/r-/'` && \
  apt-get clean && \
  rm -rf /var/lib/apt/lists/* && \
  mkdir -p /var/lib/apt/lists/partial && \
- rm sarge-versions.txt
+ rm versions-sarge.txt versions-1x.txt
 
 WORKDIR /root
 
-COPY sarge-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-sarge.sh /usr/local/bin/entrypoint.sh
 COPY inode64.so /usr/local/lib/inode64.so
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 

diff --git a/containers/Dockerfile-2.x b/containers/Dockerfile-2.x
@@ -5,23 +5,23 @@ FROM debian/eol:wheezy
 ENV PAGER=less
 ENV LESS=-r
 
-COPY 2.x-versions.txt .
+COPY versions-2.x.txt .
 
 RUN apt-get update && \
  apt-get install -y linux32 wget ca-certificates && \
- for ver in `cat 2.x-versions.txt`; do \
+ for ver in `cat versions-2.x.txt`; do \
  wget https://github.com/r-hub/R/releases/download/v${ver}/r-evercran-debian-7.11-${ver}_1-1_i386.deb && \
  dpkg -i r-evercran-debian-7.11-${ver}_1-1_i386.deb || true && \
  apt-get -fy install; \
  done && \
  apt-get clean && \
  rm -rf /var/lib/apt/lists/* && \
  mkdir -p /var/lib/apt/lists/partial && \
- rm 2.x-versions.txt
+ rm versions-2.x.txt
 
 WORKDIR /root
 
-COPY wheezy-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-wheezy.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 CMD [ "bash" ]
diff --git a/containers/Dockerfile-bookworm b/containers/Dockerfile-bookworm
@@ -33,7 +33,7 @@ COPY cran.txt /tmp/cran.txt
 COPY set-cran.sh /tmp/set-cran.sh
 RUN R_VERSION=${R_VERSION} /tmp/set-cran.sh
 
-COPY bookworm-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-bookworm.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 CMD [ "R" ]
diff --git a/containers/Dockerfile-etch b/containers/Dockerfile-etch
@@ -33,7 +33,7 @@ COPY cran.txt /tmp/cran.txt
 COPY set-cran.sh /tmp/set-cran.sh
 RUN R_VERSION=${R_VERSION} /tmp/set-cran.sh
 
-COPY etch-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-etch.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 CMD [ "R" ]
diff --git a/containers/Dockerfile-lenny b/containers/Dockerfile-lenny
@@ -33,7 +33,7 @@ COPY cran.txt /tmp/cran.txt
 COPY set-cran.sh /tmp/set-cran.sh
 RUN R_VERSION=${R_VERSION} /tmp/set-cran.sh
 
-COPY lenny-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-lenny.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 CMD [ "R" ]
diff --git a/containers/Dockerfile-pre b/containers/Dockerfile-pre
@@ -8,18 +8,18 @@ ENV LESS=-r
 RUN echo 'deb http://ppa.r-pkg.org/evercran sarge main' \
  >> /etc/apt/sources.list
 
-COPY prerelease-versions.txt .
+COPY versions-prerelease.txt .
 
 RUN apt-get update && \
- apt-get install -y linux32 `cat prerelease-versions.txt | sed 's/^/r-/'` && \
+ apt-get install -y linux32 `cat versions-prerelease.txt | sed 's/^/r-/'` && \
  apt-get clean && \
  rm -rf /var/lib/apt/lists/* && \
  mkdir -p /var/lib/apt/lists/partial && \
- rm prerelease-versions.txt
+ rm versions-prerelease.txt
 
 WORKDIR /root
 
-COPY sarge-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-sarge.sh /usr/local/bin/entrypoint.sh
 COPY inode64.so /usr/local/lib/inode64.so
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 

diff --git a/containers/Dockerfile-sarge b/containers/Dockerfile-sarge
@@ -33,7 +33,7 @@ COPY cran.txt /tmp/cran.txt
 COPY set-cran.sh /tmp/set-cran.sh
 RUN R_VERSION=${R_VERSION} /tmp/set-cran.sh
 
-COPY sarge-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-sarge.sh /usr/local/bin/entrypoint.sh
 COPY inode64.so /usr/local/lib/inode64.so
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 

diff --git a/containers/Dockerfile-squeeze b/containers/Dockerfile-squeeze
@@ -33,7 +33,7 @@ COPY cran.txt /tmp/cran.txt
 COPY set-cran.sh /tmp/set-cran.sh
 RUN R_VERSION=${R_VERSION} /tmp/set-cran.sh
 
-COPY squeeze-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY entrypoint-squeeze.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 CMD [ "R" ]
diff --git a/containers/bookworm-entrypoint.sh → containers/entrypoint-bookworm.sh b/containers/bookworm-entrypoint.sh → containers/entrypoint-bookworm.sh
diff --git a/containers/etch-entrypoint.sh → containers/entrypoint-etch.sh b/containers/etch-entrypoint.sh → containers/entrypoint-etch.sh
diff --git a/containers/lenny-entrypoint.sh → containers/entrypoint-lenny.sh b/containers/lenny-entrypoint.sh → containers/entrypoint-lenny.sh
diff --git a/containers/sarge-entrypoint.sh → containers/entrypoint-sarge.sh b/containers/sarge-entrypoint.sh → containers/entrypoint-sarge.sh
diff --git a/containers/squeeze-entrypoint.sh → containers/entrypoint-squeeze.sh b/containers/squeeze-entrypoint.sh → containers/entrypoint-squeeze.sh
diff --git a/containers/wheezy-entrypoint.sh → containers/entrypoint-wheezy.sh b/containers/wheezy-entrypoint.sh → containers/entrypoint-wheezy.sh
diff --git a/containers/2.x-versions.txt → containers/versions-2.x.txt b/containers/2.x-versions.txt → containers/versions-2.x.txt
diff --git a/containers/bookworm-versions.txt → containers/versions-bookworm.txt b/containers/bookworm-versions.txt → containers/versions-bookworm.txt
diff --git a/containers/etch-versions.txt → containers/versions-etch.txt b/containers/etch-versions.txt → containers/versions-etch.txt
diff --git a/containers/lenny-versions.txt → containers/versions-lenny.txt b/containers/lenny-versions.txt → containers/versions-lenny.txt
diff --git a/containers/prerelease-versions.txt → containers/versions-prerelease.txt b/containers/prerelease-versions.txt → containers/versions-prerelease.txt
diff --git a/containers/sarge-versions.txt → containers/versions-sarge.txt b/containers/sarge-versions.txt → containers/versions-sarge.txt
diff --git a/containers/squeeze-versions.txt → containers/versions-squeeze.txt b/containers/squeeze-versions.txt → containers/versions-squeeze.txt