Merge branch 'fix-1' of https://github.com/kit-ty-kate/opam2web into …

…deploy-fixes
avsm · Sep 14, 2021 · edcf1bd · edcf1bd
2 parents 8c1adc1 + 77705af
commit edcf1bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -46,7 +46,7 @@ ARG DOMAIN=opam.ocaml.org
 COPY --from=build-opam2web /opt/opam2web /usr/local
 COPY --from=build-opam-doc /usr/bin/opam /usr/local/bin/opam
 COPY --from=build-opam-doc /opt/opam/doc /usr/local/share/opam2web/content/doc
-ADD scripts/opam-web.sh /usr/local/bin
+ADD bin/opam-web.sh /usr/local/bin
 VOLUME ["/www"]
 RUN addgroup -g 82 -S www-data && adduser -u 82 -D -S -G www-data www-data
 USER www-data

diff --git a/bin/opam-web.sh b/bin/opam-web.sh
@@ -37,12 +37,12 @@ fi
 # Overwrite 'repo' file, and dispatch all non-standard versions
 cat <<EOF >repo
 opam-version: "2.0"
-browse: "https://opam.ocaml.org/pkg/"
+browse: "https://${BASEURL}/pkg/"
 upstream: "https://github.com/ocaml/opam-repository/tree/master/"
 redirect: [
-  "${URL}1.1" { opam-version < "1.2" }
-  "${URL}1.2.0" { opam-version < "1.2.2" }
-  "${URL}1.2.2" { opam-version < "2.0~" }
+  "https://${BASEURL}/1.1" { opam-version < "1.2" }
+  "https://${BASEURL}/1.2.0" { opam-version < "1.2.2" }
+  "https://${BASEURL}/1.2.2" { opam-version < "2.0~" }
 ]
 EOF
 mkdir -p /persist/repo-cache/archives