Prepare project for Webapp + Support multiple images with Docker compose (#27)

2025-12-19 18:14:56 -05:00 · 2020-08-10 17:53:19 -07:00
parent 4319ba4ddd
commit 5f3c82d6f5
34 changed files with 14543 additions and 133 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -0,0 +1,5 @@
+.git
+.gradle
+.idea
+**/build
+**/node_modules
--- a/.env
+++ b/.env
@@ -0,0 +1 @@
+VERSION=0.1.0
--- a/.version
+++ b/.version
@@ -1 +0,0 @@
-0.1.0
--- a/17
+++ b/17
@@ -1,17 +0,0 @@
-# BUILD
-FROM gradle:jdk14 AS build
-
-COPY . /code
-WORKDIR /code
-RUN gradle distTar --no-daemon
-
-# RUN
-FROM openjdk:14.0.2-slim
-EXPOSE 8080
-
-WORKDIR /app/conduit-server
-
-COPY --from=build /code/conduit-server/build/distributions/*.tar conduit-server.tar
-RUN tar xf conduit-server.tar --strip-components=1
-
-CMD bin/conduit-server
--- a/README.md
+++ b/README.md
@@ -2,9 +2,15 @@

 Simply run

-```text
+```bash
 ./tools/app/start.sh
 ```

-And go to [http://localhost:8080](http://localhost:8080)
+Go to [http://localhost:8000](http://localhost:8000)

+##
+
+Update public images:
+```bash
+docker-compose -f docker-compose.dev.yaml -f docker-compose.dist.yaml push
+```
--- a/build.gradle
+++ b/build.gradle
@@ -6,11 +6,17 @@ buildscript {

 allprojects {
    group = "io.dataline.${rootProject.name}"
-    version = rootProject.file('.version').text.trim()
+    version = rootProject.file('.env').eachLine {
+        if (it =~ /^VERSION=/) {
+            return it.split(/=/, 2)[1]
+        }
+        throw new Exception("Unknown version")
+    }
 }

 // For java projects (might need to add some filtering once we have the UI)
 subprojects {
+
    apply plugin: 'java'

    repositories {
--- a/conduit-server/build.gradle
+++ b/conduit-server/build.gradle
@@ -31,12 +31,3 @@ dependencies {
 application {
    mainClass = 'io.dataline.conduit.server.ServerApp'
 }
-
-task fatjar(type: Jar) {
-    manifest {
-        attributes 'Main-Class': 'io.dataline.conduit.server.ServerApp'
-    }
-    baseName "${rootProject.name}-fatjar"
-    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
-    with jar
-}
--- a/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java
+++ b/conduit-server/src/main/java/io/dataline/conduit/server/ServerApp.java
@@ -12,15 +12,12 @@ import org.slf4j.LoggerFactory;
 public class ServerApp {
  private static final Logger LOGGER = LoggerFactory.getLogger(ServerApp.class);

-  public ServerApp() {}
-
  public void start() throws Exception {
-    Server server = new Server(8080);
+    Server server = new Server(8000);

    ServletContextHandler handler = new ServletContextHandler();

-        ResourceConfig rc = new ResourceConfig()
-                .registerClasses(ConduitConfigurationApi.class);
+    ResourceConfig rc = new ResourceConfig().registerClasses(ConduitConfigurationApi.class);

    ServletHolder conduitServlet = new ServletHolder(new ServletContainer(rc));

--- a/conduit-server/src/main/java/io/dataline/conduit/server/apis/ConduitConfigurationApi.java
+++ b/conduit-server/src/main/java/io/dataline/conduit/server/apis/ConduitConfigurationApi.java
@@ -1,125 +1,137 @@
 package io.dataline.conduit.server.apis;

+import io.dataline.conduit.api.model.*;
 import javax.validation.Valid;
 import javax.ws.rs.Path;

-import io.dataline.conduit.api.model.*;
-
@Path("/v1")
 public class ConduitConfigurationApi implements io.dataline.conduit.api.V1Api {

-    @Override
-    public ConnectionRead createConnection(@Valid ConnectionCreate connectionCreate) {
-        return null;
-    }
+  @Override
+  public ConnectionRead createConnection(@Valid ConnectionCreate connectionCreate) {
+    return null;
+  }

-    @Override
-    public DestinationImplementationRead createDestinationImplementation(@Valid DestinationImplementationCreate destinationImplementationCreate) {
-        return null;
-    }
+  @Override
+  public DestinationImplementationRead createDestinationImplementation(
+      @Valid DestinationImplementationCreate destinationImplementationCreate) {
+    return null;
+  }

-    @Override
-    public SourceImplementationRead createSourceImplementation(@Valid SourceImplementationCreate sourceImplementationCreate) {
-        return null;
-    }
+  @Override
+  public SourceImplementationRead createSourceImplementation(
+      @Valid SourceImplementationCreate sourceImplementationCreate) {
+    return null;
+  }

-    @Override
-    public SourceImplementationDiscoverSchemaRead discoverSchemaForSourceImplementation(@Valid SourceImplementationIdRequestBody sourceImplementationIdRequestBody) {
-        return null;
-    }
+  @Override
+  public SourceImplementationDiscoverSchemaRead discoverSchemaForSourceImplementation(
+      @Valid SourceImplementationIdRequestBody sourceImplementationIdRequestBody) {
+    return null;
+  }

-    @Override
-    public ConnectionRead getConnection(@Valid ConnectionIdRequestBody connectionIdRequestBody) {
-        return null;
-    }
+  @Override
+  public ConnectionRead getConnection(@Valid ConnectionIdRequestBody connectionIdRequestBody) {
+    return null;
+  }

-    @Override
-    public DestinationRead getDestination(@Valid DestinationIdRequestBody destinationIdRequestBody) {
-        return null;
-    }
+  @Override
+  public DestinationRead getDestination(@Valid DestinationIdRequestBody destinationIdRequestBody) {
+    return null;
+  }

-    @Override
-    public DestinationImplementationRead getDestinationImplementation(@Valid DestinationImplementationIdRequestBody destinationImplementationIdRequestBody) {
-        return null;
-    }
+  @Override
+  public DestinationImplementationRead getDestinationImplementation(
+      @Valid DestinationImplementationIdRequestBody destinationImplementationIdRequestBody) {
+    return null;
+  }

-    @Override
-    public DestinationSpecificationRead getDestinationSpecification(@Valid DestinationIdRequestBody destinationIdRequestBody) {
-        return null;
-    }
+  @Override
+  public DestinationSpecificationRead getDestinationSpecification(
+      @Valid DestinationIdRequestBody destinationIdRequestBody) {
+    return null;
+  }

-    @Override
-    public SourceRead getSource(@Valid SourceIdRequestBody sourceIdRequestBody) {
-        return null;
-    }
+  @Override
+  public SourceRead getSource(@Valid SourceIdRequestBody sourceIdRequestBody) {
+    return null;
+  }

-    @Override
-    public SourceImplementationRead getSourceImplementation(@Valid SourceImplementationIdRequestBody sourceImplementationIdRequestBody) {
-        return null;
-    }
+  @Override
+  public SourceImplementationRead getSourceImplementation(
+      @Valid SourceImplementationIdRequestBody sourceImplementationIdRequestBody) {
+    return null;
+  }

-    @Override
-    public SourceImplementationReadList getSourceImplementationsForWorkspace(@Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
-        return null;
-    }
+  @Override
+  public SourceImplementationReadList getSourceImplementationsForWorkspace(
+      @Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
+    return null;
+  }

-    @Override
-    public SourceSpecificationRead getSourceSpecification(@Valid SourceIdRequestBody sourceIdRequestBody) {
-        return null;
-    }
+  @Override
+  public SourceSpecificationRead getSourceSpecification(
+      @Valid SourceIdRequestBody sourceIdRequestBody) {
+    return null;
+  }

-    @Override
-    public WorkspaceRead getWorkspace(@Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
-        return null;
-    }
+  @Override
+  public WorkspaceRead getWorkspace(@Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
+    return null;
+  }

-    @Override
-    public WorkspaceRead getWorkspaceBySlug(@Valid SlugRequestBody slugRequestBody) {
-        return null;
-    }
+  @Override
+  public WorkspaceRead getWorkspaceBySlug(@Valid SlugRequestBody slugRequestBody) {
+    return null;
+  }

-    @Override
-    public ConnectionReadList listConnectionsForWorkspace(@Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
-        return null;
-    }
+  @Override
+  public ConnectionReadList listConnectionsForWorkspace(
+      @Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
+    return null;
+  }

-    @Override
-    public DestinationImplementationReadList listDestinationImplementationsForWorkspace(@Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
-        return null;
-    }
+  @Override
+  public DestinationImplementationReadList listDestinationImplementationsForWorkspace(
+      @Valid WorkspaceIdRequestBody workspaceIdRequestBody) {
+    return null;
+  }

-    @Override
-    public DestinationReadList listDestinations() {
-        return null;
-    }
+  @Override
+  public DestinationReadList listDestinations() {
+    return null;
+  }

-    @Override
-    public SourceReadList listSources() {
-        return null;
-    }
+  @Override
+  public SourceReadList listSources() {
+    return null;
+  }

-    @Override
-    public ConnectionSyncRead syncConnection(@Valid ConnectionIdRequestBody connectionIdRequestBody) {
-        return null;
-    }
+  @Override
+  public ConnectionSyncRead syncConnection(@Valid ConnectionIdRequestBody connectionIdRequestBody) {
+    return null;
+  }

-    @Override
-    public SourceImplementationTestConnectionRead testConnectiontoSourceImplementation(@Valid SourceImplementationIdRequestBody sourceImplementationIdRequestBody) {
-        return null;
-    }
+  @Override
+  public SourceImplementationTestConnectionRead testConnectiontoSourceImplementation(
+      @Valid SourceImplementationIdRequestBody sourceImplementationIdRequestBody) {
+    return null;
+  }

-    @Override
-    public ConnectionRead updateConnection(@Valid ConnectionUpdate connectionUpdate) {
-        return null;
-    }
+  @Override
+  public ConnectionRead updateConnection(@Valid ConnectionUpdate connectionUpdate) {
+    return null;
+  }

-    @Override
-    public DestinationImplementationRead updateDestinationImplementation(@Valid DestinationImplementationUpdate destinationImplementationUpdate) {
-        return null;
-    }
+  @Override
+  public DestinationImplementationRead updateDestinationImplementation(
+      @Valid DestinationImplementationUpdate destinationImplementationUpdate) {
+    return null;
+  }

-    @Override
-    public SourceImplementationRead updateSourceImplementation(@Valid SourceImplementationUpdate sourceImplementationUpdate) {
-        return null;
-    }
+  @Override
+  public SourceImplementationRead updateSourceImplementation(
+      @Valid SourceImplementationUpdate sourceImplementationUpdate) {
+    return null;
+  }
 }
--- a/conduit-webapp/.gitignore
+++ b/conduit-webapp/.gitignore
@@ -0,0 +1,23 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
--- a/conduit-webapp/README.md
+++ b/conduit-webapp/README.md
@@ -0,0 +1,68 @@
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `npm start`
+
+Runs the app in the development mode.<br />
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.<br />
+You will also see any lint errors in the console.
+
+### `npm test`
+
+Launches the test runner in the interactive watch mode.<br />
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `npm run build`
+
+Builds the app for production to the `build` folder.<br />
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br />
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `npm run eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
+
+### Analyzing the Bundle Size
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
+
+### Making a Progressive Web App
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
+
+### Advanced Configuration
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
+
+### Deployment
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
+
+### `npm run build` fails to minify
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
--- a/conduit-webapp/nginx.conf
+++ b/conduit-webapp/nginx.conf
--- a/conduit-webapp/package-lock.json
+++ b/conduit-webapp/package-lock.json
--- a/conduit-webapp/package.json
+++ b/conduit-webapp/package.json
@@ -0,0 +1,34 @@
+{
+  "name": "conduit-webapp",
+  "version": "0.1.0",
+  "private": true,
+  "dependencies": {
+    "@testing-library/jest-dom": "^4.2.4",
+    "@testing-library/react": "^9.5.0",
+    "@testing-library/user-event": "^7.2.1",
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1",
+    "react-scripts": "3.4.1"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test",
+    "eject": "react-scripts eject"
+  },
+  "eslintConfig": {
+    "extends": "react-app"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
+  }
+}
--- a/conduit-webapp/public/favicon.ico
+++ b/conduit-webapp/public/favicon.ico
--- a/conduit-webapp/public/index.html
+++ b/conduit-webapp/public/index.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#000000" />
+    <meta
+      name="description"
+      content="Web site created using create-react-app"
+    />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+    <!--
+      Notice the use of %PUBLIC_URL% in the tags above.
+      It will be replaced with the URL of the `public` folder during the build.
+      Only files inside the `public` folder can be referenced from the HTML.
+
+      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
+      work correctly both with client-side routing and a non-root public URL.
+      Learn how to configure a non-root public URL by running `npm run build`.
+    -->
+    <title>React App</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <!--
+      This HTML file is a template.
+      If you open it directly in the browser, you will see an empty page.
+
+      You can add webfonts, meta tags, or analytics to this file.
+      The build step will place the bundled scripts into the <body> tag.
+
+      To begin the development, run `npm start` or `yarn start`.
+      To create a production bundle, use `npm run build` or `yarn build`.
+    -->
+  </body>
+</html>
--- a/conduit-webapp/public/logo192.png
+++ b/conduit-webapp/public/logo192.png
--- a/conduit-webapp/public/logo512.png
+++ b/conduit-webapp/public/logo512.png
--- a/conduit-webapp/public/manifest.json
+++ b/conduit-webapp/public/manifest.json
@@ -0,0 +1,25 @@
+{
+  "short_name": "React App",
+  "name": "Create React App Sample",
+  "icons": [
+    {
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
+    },
+    {
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
+    }
+  ],
+  "start_url": ".",
+  "display": "standalone",
+  "theme_color": "#000000",
+  "background_color": "#ffffff"
+}
--- a/conduit-webapp/public/robots.txt
+++ b/conduit-webapp/public/robots.txt
@@ -0,0 +1,3 @@
+# https://www.robotstxt.org/robotstxt.html
+User-agent: *
+Disallow:
--- a/conduit-webapp/src/App.css
+++ b/conduit-webapp/src/App.css
@@ -0,0 +1,38 @@
+.App {
+  text-align: center;
+}
+
+.App-logo {
+  height: 40vmin;
+  pointer-events: none;
+}
+
+@media (prefers-reduced-motion: no-preference) {
+  .App-logo {
+    animation: App-logo-spin infinite 20s linear;
+  }
+}
+
+.App-header {
+  background-color: #282c34;
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  font-size: calc(10px + 2vmin);
+  color: white;
+}
+
+.App-link {
+  color: #61dafb;
+}
+
+@keyframes App-logo-spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
--- a/conduit-webapp/src/App.js
+++ b/conduit-webapp/src/App.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import logo from './logo.svg';
+import './App.css';
+
+function App() {
+  return (
+    <div className="App">
+      <header className="App-header">
+        <img src={logo} className="App-logo" alt="logo" />
+        <p>
+          Edit <code>src/App.js</code> and save to reload.
+        </p>
+        <a
+          className="App-link"
+          href="https://reactjs.org"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
+          Learn React
+        </a>
+      </header>
+    </div>
+  );
+}
+
+export default App;
--- a/conduit-webapp/src/App.test.js
+++ b/conduit-webapp/src/App.test.js
@@ -0,0 +1,9 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import App from './App';
+
+test('renders learn react link', () => {
+  const { getByText } = render(<App />);
+  const linkElement = getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});
--- a/conduit-webapp/src/index.css
+++ b/conduit-webapp/src/index.css
@@ -0,0 +1,13 @@
+body {
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}
--- a/conduit-webapp/src/index.js
+++ b/conduit-webapp/src/index.js
@@ -0,0 +1,17 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+import App from './App';
+import * as serviceWorker from './serviceWorker';
+
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root')
+);
+
+// If you want your app to work offline and load faster, you can change
+// unregister() to register() below. Note this comes with some pitfalls.
+// Learn more about service workers: https://bit.ly/CRA-PWA
+serviceWorker.unregister();
--- a/conduit-webapp/src/logo.svg
+++ b/conduit-webapp/src/logo.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>
--- a/conduit-webapp/src/serviceWorker.js
+++ b/conduit-webapp/src/serviceWorker.js
@@ -0,0 +1,141 @@
+// This optional code is used to register a service worker.
+// register() is not called by default.
+
+// This lets the app load faster on subsequent visits in production, and gives
+// it offline capabilities. However, it also means that developers (and users)
+// will only see deployed updates on subsequent visits to a page, after all the
+// existing tabs open on the page have been closed, since previously cached
+// resources are updated in the background.
+
+// To learn more about the benefits of this model and instructions on how to
+// opt-in, read https://bit.ly/CRA-PWA
+
+const isLocalhost = Boolean(
+  window.location.hostname === 'localhost' ||
+    // [::1] is the IPv6 localhost address.
+    window.location.hostname === '[::1]' ||
+    // 127.0.0.0/8 are considered localhost for IPv4.
+    window.location.hostname.match(
+      /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
+    )
+);
+
+export function register(config) {
+  if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
+    // The URL constructor is available in all browsers that support SW.
+    const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
+    if (publicUrl.origin !== window.location.origin) {
+      // Our service worker won't work if PUBLIC_URL is on a different origin
+      // from what our page is served on. This might happen if a CDN is used to
+      // serve assets; see https://github.com/facebook/create-react-app/issues/2374
+      return;
+    }
+
+    window.addEventListener('load', () => {
+      const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
+
+      if (isLocalhost) {
+        // This is running on localhost. Let's check if a service worker still exists or not.
+        checkValidServiceWorker(swUrl, config);
+
+        // Add some additional logging to localhost, pointing developers to the
+        // service worker/PWA documentation.
+        navigator.serviceWorker.ready.then(() => {
+          console.log(
+            'This web app is being served cache-first by a service ' +
+              'worker. To learn more, visit https://bit.ly/CRA-PWA'
+          );
+        });
+      } else {
+        // Is not localhost. Just register service worker
+        registerValidSW(swUrl, config);
+      }
+    });
+  }
+}
+
+function registerValidSW(swUrl, config) {
+  navigator.serviceWorker
+    .register(swUrl)
+    .then(registration => {
+      registration.onupdatefound = () => {
+        const installingWorker = registration.installing;
+        if (installingWorker == null) {
+          return;
+        }
+        installingWorker.onstatechange = () => {
+          if (installingWorker.state === 'installed') {
+            if (navigator.serviceWorker.controller) {
+              // At this point, the updated precached content has been fetched,
+              // but the previous service worker will still serve the older
+              // content until all client tabs are closed.
+              console.log(
+                'New content is available and will be used when all ' +
+                  'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
+              );
+
+              // Execute callback
+              if (config && config.onUpdate) {
+                config.onUpdate(registration);
+              }
+            } else {
+              // At this point, everything has been precached.
+              // It's the perfect time to display a
+              // "Content is cached for offline use." message.
+              console.log('Content is cached for offline use.');
+
+              // Execute callback
+              if (config && config.onSuccess) {
+                config.onSuccess(registration);
+              }
+            }
+          }
+        };
+      };
+    })
+    .catch(error => {
+      console.error('Error during service worker registration:', error);
+    });
+}
+
+function checkValidServiceWorker(swUrl, config) {
+  // Check if the service worker can be found. If it can't reload the page.
+  fetch(swUrl, {
+    headers: { 'Service-Worker': 'script' },
+  })
+    .then(response => {
+      // Ensure service worker exists, and that we really are getting a JS file.
+      const contentType = response.headers.get('content-type');
+      if (
+        response.status === 404 ||
+        (contentType != null && contentType.indexOf('javascript') === -1)
+      ) {
+        // No service worker found. Probably a different app. Reload the page.
+        navigator.serviceWorker.ready.then(registration => {
+          registration.unregister().then(() => {
+            window.location.reload();
+          });
+        });
+      } else {
+        // Service worker found. Proceed as normal.
+        registerValidSW(swUrl, config);
+      }
+    })
+    .catch(() => {
+      console.log(
+        'No internet connection found. App is running in offline mode.'
+      );
+    });
+}
+
+export function unregister() {
+  if ('serviceWorker' in navigator) {
+    navigator.serviceWorker.ready
+      .then(registration => {
+        registration.unregister();
+      })
+      .catch(error => {
+        console.error(error.message);
+      });
+  }
+}
--- a/conduit-webapp/src/setupTests.js
+++ b/conduit-webapp/src/setupTests.js
@@ -0,0 +1,5 @@
+// jest-dom adds custom jest matchers for asserting on DOM nodes.
+// allows you to do things like:
+// expect(element).toHaveTextContent(/react/i)
+// learn more: https://github.com/testing-library/jest-dom
+import '@testing-library/jest-dom/extend-expect';
--- a/docker-compose.dev.yaml
+++ b/docker-compose.dev.yaml
@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  server:
+    build:
+      context: .
+      dockerfile: server.Dockerfile
+    image: server:dev
+    container_name: conduit-server
+    ports:
+      - 8001:8000
+  webapp:
+    build:
+      context: .
+      dockerfile: webapp.Dockerfile
+    image: webapp:dev
+    container_name: conduit-webapp
+    ports:
+      - 8000:80
+    depends_on:
+      - server
--- a/docker-compose.dist.yaml
+++ b/docker-compose.dist.yaml
@@ -0,0 +1,7 @@
+version: '3'
+
+services:
+  server:
+    image: dataline/conduit-server:${VERSION}
+  webapp:
+    image: dataline/conduit-webapp:${VERSION}
--- a/server.Dockerfile
+++ b/server.Dockerfile
@@ -0,0 +1,36 @@
+# Prepare gradle dependency cache
+FROM gradle:jdk14 AS cache
+
+WORKDIR /code
+
+# for i in **/*.gradle; do echo COPY ./$i $(dirname $i)/; done
+COPY ./.env ./
+COPY ./build.gradle ./
+COPY ./conduit-api/build.gradle conduit-api/
+COPY ./conduit-commons/build.gradle conduit-commons/
+COPY ./conduit-server/build.gradle conduit-server/
+COPY ./settings.gradle ./
+
+RUN gradle --gradle-user-home=/tmp/gradle_cache clean dependencies --no-daemon
+
+# Build artifact
+FROM gradle:jdk14 AS build
+
+WORKDIR /code
+
+COPY --from=cache /tmp/gradle_cache /home/gradle/.gradle
+COPY . /code
+RUN gradle clean distTar --no-daemon
+RUN ls /code/conduit-server/build/distributions/
+
+# Build final image
+FROM openjdk:14.0.2-slim
+
+EXPOSE 8000
+
+WORKDIR /app/conduit-server
+
+COPY --from=build /code/conduit-server/build/distributions/*.tar conduit-server.tar
+RUN tar xf conduit-server.tar --strip-components=1
+
+CMD bin/conduit-server
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 rootProject.name = 'conduit'

 include 'conduit-api'
-include 'conduit-server'
 include 'conduit-commons'
 include 'conduit-config'
 include 'conduit-config-persistence'
+include 'conduit-server'
--- a/tools/app/start.sh
+++ b/tools/app/start.sh
@@ -9,9 +9,7 @@ PORT=${PORT:-8080}
 main() {
  assert_root

-  docker run --rm -it \
-    -p $PORT:8080 \
-    dataline/conduit:$VERSION
+  docker-compose -f docker-compose.dev.yaml up --build
 }

 main "$@"
--- a/webapp.Dockerfile
+++ b/webapp.Dockerfile
@@ -0,0 +1,23 @@
+# Cache node modules
+FROM node:14.7-alpine AS cache
+
+WORKDIR /code
+
+COPY conduit-webapp/package.json conduit-webapp/package-lock.json ./
+RUN npm install
+
+# Build webapp
+FROM node:14.7-alpine AS build
+
+WORKDIR /code
+
+COPY --from=cache /code/node_modules /code/node_modules
+COPY conduit-webapp /code
+RUN npm run-script build
+
+# Build final image
+FROM nginx:1.19-alpine
+
+EXPOSE 80
+
+COPY --from=build /code/build /usr/share/nginx/html