Unverified Commit 9a54664f authored by watucker's avatar watucker Committed by GitHub
Browse files

Merge branch 'master' into thredds-upgrade

parents eaf60f4c 0aaa69d1

README.md

+0 −6
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ git clone https://github.com/ESGF/esgf-docker.git 
cd esgf-docker

```



These changes have not yet been committed to `master`, so you will need to check out the development branch:



```sh

git checkout future-architecture

```



Then follow the deployment guide for your chosen deployment method:



  * [Deploy ESGF using Ansible](./docs/deploy-ansible.md)

images/base/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ ENV LC_ALL en_US.UTF-8 


# Upgrade all existing packages

# Updating CACHE_BUST to the current time will bust the cache and force a rebuild

RUN CACHE_BUST="20220628"; \

RUN CACHE_BUST="20220923"; \

    yum makecache && yum upgrade -y && yum clean all



# Install ca-certificates and openssl