pin submodules to sandbox branches

UCDavisLibrary · Dec 1, 2021 · 2aa3f18 · 2aa3f18
1 parent f04ace8
commit 2aa3f18
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,8 +1,8 @@
 [submodule "ucdlib-theme-wp"]
 	path = ucdlib-theme-wp
 	url = https://github.com/UCDavisLibrary/ucdlib-theme-wp
-	branch = main
+	branch = sandbox
 [submodule "ucdlib-wp-plugins"]
 	path = ucdlib-wp-plugins
 	url = https://github.com/UCDavisLibrary/ucdlib-wp-plugins
-	branch = main
+	branch = sandbox
diff --git a/Dockerfile b/Dockerfile
@@ -70,6 +70,16 @@ COPY ucdlib-theme-wp/views views
 WORKDIR $PLUGIN_ROOT
 COPY ucdlib-wp-plugins/ucd-cas ucd-cas
 
+# set build tags
+ARG WEBSITE_TAG
+ENV WEBSITE_TAG ${WEBSITE_TAG}
+ARG APP_VERSION
+ENV APP_VERSION ${APP_VERSION}
+ARG BUILD_NUM
+ENV BUILD_NUM ${BUILD_NUM}
+ARG BUILD_TIME
+ENV BUILD_TIME ${BUILD_TIME}
+
 # Back to site root so wordpress can do the rest of its thing
 WORKDIR "/var/www/html"
 

diff --git a/readme.md b/readme.md
@@ -1 +1,6 @@
-# Website config
+# Main Wordpress Website Docker Config
+
+This repo contains the Dockerfile and code (as git submodules) for running the main UC Davis Library website. 
+
+## Deployment
+See the [main-wp-website-deployment](https://github.com/UCDavisLibrary/main-wp-website-deployment) repository.
diff --git a/ucdlib-theme-wp b/ucdlib-theme-wp
diff --git a/ucdlib-wp-plugins b/ucdlib-wp-plugins
+4 −0		src/editor/blocks/ucd-theme-button-link/index.js
+6 −2		src/editor/blocks/ucd-theme-heading/index.js
+11 −0		theme/includes/classes/customizer.php
+7 −0		theme/includes/classes/site.php
+1 −0		theme/includes/classes/views.php
+1 −1		theme/style.css
+14 −1		views/template-partials/footer.twig