Update README.md

updated demo url

CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this project will be documented in this file.
  
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
- 
+
+<!--
+Template for next version
 ## [Unreleased]
 
 ### Added
@@ -14,6 +16,42 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 
 ### Security
+-->
+
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Fixed
+
+* Fixed typo https://github.com/ohmyform/ohmyform/pull/185
+* node prune location (https://github.com/ohmyform/ohmyform/issues/184)
+
+### Security
+
+## [1.0.3] - 2022-03-27
+
+### Updates
+
+* https://github.com/ohmyform/api/releases/tag/1.0.3
+* https://github.com/ohmyform/ui/releases/tag/1.0.3
+
+### Added
+
+* minimal configuration example for caddy server (https://github.com/ohmyform/ohmyform/pull/167)
+
+## [1.0.2] - 2022-03-13
+
+### Updates
+
+* https://github.com/ohmyform/api/releases/tag/1.0.2
+* https://github.com/ohmyform/ui/releases/tag/1.0.2
+
+### Changed
+
+- docker restart policy (https://github.com/ohmyform/ohmyform/issues/164)
 
 ## [1.0.1] - 2022-03-01
 

Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /usr/src/ui
 RUN apk --update --no-cache add curl bash g++ make libpng-dev
 
 # install node-prune (https://github.com/tj/node-prune)
-RUN curl -sfL https://install.goreleaser.com/github.com/tj/node-prune.sh | bash -s -- -b /usr/local/bin
+RUN curl -sf https://gobinaries.com/tj/node-prune | sh
 
 COPY ui/ .
 
@@ -29,7 +29,7 @@ WORKDIR /usr/src/api
 RUN apk --update --no-cache add curl bash g++ make libpng-dev
 
 # install node-prune (https://github.com/tj/node-prune)
-RUN curl -sfL https://install.goreleaser.com/github.com/tj/node-prune.sh | bash -s -- -b /usr/local/bin
+RUN curl -sf https://gobinaries.com/tj/node-prune | sh
 
 COPY api/ .
 

README.md

@@ -10,7 +10,7 @@
 
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/ohmyform/ohmyform/tree/master)
 
-[Demo](https://omf-demo.herokuapp.com/)
+[Demo](https://demo.ohmyform.org/) Username and password are just `demo`.  We will reset the demo instance at least once for every new release and possibly more often so don't rely on it for sending actual forms expect no notice for resets.
 
 > An *open source alternative to TypeForm* that can create stunning mobile-ready forms, surveys and questionnaires.
 
@@ -52,7 +52,7 @@
 	- Custom Subdomains for each User
 	- Implement encryption for all form data
 	- Add Typeform API integration
-	- Add plugin/3rd party integration support (ala Slack)
+	- Add plugin/3rd party integration support (aka Slack)
 	- Create wiki for easy installation and setup
 	- Add Stripe/Payment Form field
 	- Add Custom Background and Dropdown Field Images
@@ -69,7 +69,7 @@ Please checkout our [contributing guide](CONTRIBUTING.md) on ways to contribute
 
 Follow documentation hosted on [OhMyForm.com](http://ohmyform.com/docs/install/) it will be the main and hopefully only location to obtain the up to date documentation.
 
-if you pull the repository do not forget to execute: `git submodule update --init`
+If you pull the repository do not forget to execute: `git submodule update --init`
 
 ### Some technical Insights
 

api

@@ -1 +1 @@
-Subproject commit 99fe3d2fe001ac7ec8c6693513737cd8bdfe92c8
+Subproject commit c2c421baa6f41e4e6fb812fa2978956aaf7aa0dd

examples/docker_caddy_minimal/Caddyfile

@@ -0,0 +1,3 @@
+mywebsite.com {
+        reverse_proxy ohmyform:3000
+}

examples/docker_caddy_minimal/docker-compose.yml

@@ -0,0 +1,41 @@
+version: "3.9"
+
+networks:
+        web:
+                external: true
+        internal:
+                external: false
+                driver: bridge
+
+services:
+        caddy:
+                container_name: caddy
+                image: caddy:2-alpine
+                restart: unless-stopped
+                ports:
+                        - "80:80"
+                        - "443:443"
+                volumes:
+                        - /data/caddy/Caddyfile:/etc/caddy/Caddyfile
+                        - /data/caddy/data:/data # Optional
+                        - /data/caddy/config:/config # Optional
+                networks:
+                        - web
+                        - internal
+        ohmyform:
+                container_name: ohmyform
+                image: ohmyform/ohmyform
+                volumes:
+                  - "./data:/data"
+                environment:
+                  CREATE_ADMIN: "TRUE"
+                  ADMIN_EMAIL: admin@local.host
+                  ADMIN_USERNAME: admin
+                  ADMIN_PASSWORD: admin
+                  DATABASE_DRIVER: sqlite
+                  DATABASE_URL: "sqlite:///data/data.sqlite"
+                  MAILER_URI: smtp://local.host
+                  LOGIN_NOTE: "Either login with admin:admin or create your own account to test OhMyForm"
+                restart: unless-stopped
+                networks:
+                        - internal

examples/docker_for_load_balancing/docker-compose.yml

@@ -10,6 +10,7 @@ services:
       POSTGRES_USER: root
       POSTGRES_PASSWORD: root
       POSTGRES_DB: ohmyform
+    restart: unless-stopped
   ui:
     image: ohmyform/ui
     environment:
@@ -18,6 +19,7 @@ services:
       PORT: 5000
     ports:
       - "8080:5000"
+    restart: unless-stopped
   api:
     image: ohmyform/api
     environment:
@@ -38,3 +40,4 @@ services:
     depends_on:
       - db
       - redis
+    restart: unless-stopped

examples/docker_minimal/docker-compose.yml

@@ -15,3 +15,4 @@ services:
       LOGIN_NOTE: "Either login with admin:admin or create your own account to test OhMyForm"
     ports:
       - "8080:3000"
+    restart: unless-stopped

examples/docker_nginx/docker-compose.yml

@@ -8,6 +8,7 @@ services:
       POSTGRES_USER: root
       POSTGRES_PASSWORD: root
       POSTGRES_DB: ohmyform
+    restart: unless-stopped
   nginx:
     image: nginx:alpine
     volumes:
@@ -17,11 +18,13 @@ services:
     depends_on:
       - ui
       - api
+    restart: unless-stopped
   ui:
     image: ohmyform/ui
     environment:
       SERVER_ENDPOINT: http://api:5000/graphql
       PORT: 5000
+    restart: unless-stopped
   api:
     image: ohmyform/api
     environment:
@@ -38,3 +41,4 @@ services:
       - db
     depends_on:
       - db
+    restart: unless-stopped

package.json

@@ -1,4 +1,5 @@
 {
+  "version": "1.0.3",
   "name": "ohmyform",
   "description": "Opensource alternative to TypeForm",
   "homepage": "https://github.com/ohmyform/ohmyform",

ui

@@ -1 +1 @@
-Subproject commit 23e67c8f7e65396782f48ef5dfeef56ec8e45da9
+Subproject commit 011a6baef416bb9265f5172707bc21e7823c8086