summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/deploy.yml11
-rw-r--r--README.md16
2 files changed, 18 insertions, 9 deletions
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 08e537fc..a56a5fa7 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -21,7 +21,16 @@ jobs:
SSH_KNOWN_HOSTS: ${{secrets.SSH_KNOWN_HOSTS}}
- name: Pull Changes
run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && git pull origin'
+ - name: Print Versions
+ run: |
+ ssh -i ../opendc.key opendc@opendc.org bash << 'EOF'
+ cd /opt/opendc
+ source .env
+ echo "OPENDC_WEB_API_VERSION=$OPENDC_WEB_API_VERSION"
+ echo "OPENDC_RUNNER_VERSION=$OPENDC_RUNNER_VERSION"
+ echo "OPENDC_WEBSITE_VERSION=$OPENDC_WEBSITE_VERSION"
+ EOF
- name: Pull Images
run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && source .env && docker-compose -f docker-compose.yml -f docker-compose.prod.yml pull'
- name: Deploy Images
- run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && source .env && docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d'
+ run: ssh -i ../opendc.key opendc@opendc.org 'cd /opt/opendc && source .env && docker-compose -f docker-compose.yml -f docker-compose.prod.yml down && docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d'
diff --git a/README.md b/README.md
index 8645f74e..fe400372 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
<a href="https://opendc.org/">
- <img src="https://opendc.org/img/logo.png" alt="OpenDC logo" title="OpenDC" align="right" height="100" />
+ <img src="https://opendc.org/img/logo.svg" alt="OpenDC logo" title="OpenDC" align="right" height="100" />
</a>
# OpenDC
@@ -7,7 +7,7 @@
Collaborative Datacenter Simulation and Exploration for Everybody
[![MIT License](https://img.shields.io/badge/License-MIT-green.svg)](/LICENSE.txt)
-[![Documentation](https://img.shields.io/badge/docs-master-green.svg)](https://atlarge-research.github.io/opendc)
+[![Documentation](https://img.shields.io/badge/docs-master-green.svg)](https://opendc.org/opendc)
[![GitHub release](https://img.shields.io/github/v/release/atlarge-research/opendc?include_prereleases)](https://github.com/atlarge-research/opendc/releases)
[![Build](https://github.com/atlarge-research/opendc/actions/workflows/build.yml/badge.svg)](https://github.com/atlarge-research/opendc/actions/workflows/build.yml)
@@ -22,14 +22,14 @@ The latest release will be marked _latest_.
## Documentation
-You can find the OpenDC documentation [on the website](https://atlarge-research.github.io/opendc/).
+You can find the OpenDC documentation [on the website](https://opendc.org/opendc/).
The documentation is divided into several sections:
-* [Getting Started](https://atlarge-research.github.io/opendc/docs/category/getting-started/)
-* [Tutorials](https://atlarge-research.github.io/opendc/docs/category/tutorials/)
-* [Advanced Guides](https://atlarge-research.github.io/opendc/docs/category/advanced-guides/)
-* [Where to Get Support](https://atlarge-research.github.io/opendc/community/support/)
-* [Contributing Guide](https://atlarge-research.github.io/opendc/community/contributing/)
+* [Getting Started](https://opendc.org/opendc/docs/category/getting-started/)
+* [Tutorials](https://opendc.org/opendc/docs/category/tutorials/)
+* [Advanced Guides](https://opendc.org/opendc/docs/category/advanced-guides/)
+* [Where to Get Support](https://opendc.org/opendc/community/support/)
+* [Contributing Guide](https://opendc.org/opendc/community/contributing/)
The source code for the documentation is located in the [gh-pages branch](https://github.com/atlarge-research/opendc/tree/gh-pages).
Push to that branch to update the documentation.