Merge pull request #18 from w-henderson/release-manager

Rewritten release manager to allow for automatic updates

axiom/src/pages/index.tsx

@@ -55,7 +55,7 @@ class Index extends React.Component {
           <span>Integrate Together.</span>
 
           <div className="bigButtons">
-            <a href="/download/windows">
+            <a href="/release/windows">
               <DownloadIcon />
               <span>Download for Windows</span>
             </a>
@@ -116,7 +116,7 @@ class Index extends React.Component {
           </div>
 
           <div className="bigButtons">
-            <a href="/download/windows">
+            <a href="/release/windows">
               <DownloadIcon />
               <span>Download for Windows</span>
             </a>

axiom/src/pages/invite/[code].tsx

@@ -91,7 +91,7 @@ class InvitePage extends React.Component<InvitePageProps, InvitePageState> {
                     <span>Open in Equion</span>
                   </a>
 
-                  <a href="/download/windows">
+                  <a href="/release/windows">
                     <DownloadIcon />
                     <span>Download Equion</span>
                   </a>

docker-compose.prod.yml

@@ -39,15 +39,16 @@ services:
     restart: always
     expose:
       - 80
+    volumes:
+      - releaseData:/releaseData
     environment:
-      EQUION_USER: w-henderson
-      EQUION_REPO: Equion
-      EQUION_TOKEN: "$EQUION_TOKEN"
+      EQUION_MATRIX_DATA_DIR: "/releaseData"
 
   gateway:
     image: nginx:latest
     restart: always
     depends_on:
+      - download_manager
       - server
       - voice
       - web
@@ -57,7 +58,9 @@ services:
     volumes:
       - ./nginx.prod.conf:/etc/nginx/nginx.conf
       - website:/var/www/html
+      - releaseData:/releaseData
 
 volumes:
   data:
   website:
+  releaseData:

docker-compose.yml

@@ -42,15 +42,16 @@ services:
     restart: always
     expose:
       - 80
+    volumes:
+      - releaseData:/releaseData
     environment:
-      EQUION_USER: w-henderson
-      EQUION_REPO: Equion
-      EQUION_TOKEN: "$EQUION_TOKEN"
+      EQUION_MATRIX_DATA_DIR: "/releaseData"
 
   gateway:
     image: nginx:latest
     restart: always
     depends_on:
+      - download_manager
       - server
       - voice
       - web
@@ -61,7 +62,9 @@ services:
       - ./nginx.conf:/etc/nginx/nginx.conf
       - ./cert:/cert
       - website:/var/www/html
+      - releaseData:/releaseData
 
 volumes:
   data:
   website:
+  releaseData:

matrix/Dockerfile

@@ -1,19 +1,19 @@
 FROM rust:latest
 
-RUN USER=root cargo new --bin equion_download_manager
+RUN USER=root cargo new --bin matrix
 
-WORKDIR /equion_download_manager
+WORKDIR /matrix
 
-COPY ./Cargo.toml ./Cargo.toml
-COPY ./Cargo.lock ./Cargo.lock
+COPY ./server/Cargo.toml ./Cargo.toml
+COPY ./server/Cargo.lock ./Cargo.lock
 
 RUN cargo build --release
 
 RUN rm src/*.rs
-COPY ./src ./src
+COPY ./server/src ./src
 
-RUN rm ./target/release/deps/equion*
+RUN rm ./target/release/deps/matrix*
 RUN cargo build --release
 
 EXPOSE 80
-CMD ["./target/release/equion_download_manager"]
+CMD ["./target/release/matrix"]

matrix/cli/.gitignore

@@ -0,0 +1 @@
+target/