Merge pull request #1 from justcoded/develop

Fixed make init/run, docker-compose

Author: aprokopenko

CHANGELOG.md

@@ -0,0 +1,17 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+-------------------------------------------------------------------------
+
+## [1.0.0]() - _2021-10-05_
+### Added
+* Taken https://github.com/goprerender/prerender as a base
+* Added support to pass `STORAGE_URL` environment variable
+* Dockerized goprerender server and storage
+* Added docker-compose example and Makefile commands for faster setup
+
+-------------------------------------------------------------------------

Makefile

@@ -1,11 +1,13 @@
+.PHONY: init build build-server build-storage up run start down stop
+
 init:
 	@if [ ! -f '.env' ]; then \
 		echo 'Copying .env file...'; \
 		cp .env.example .env; \
 	fi;
 	@if [ ! -f 'src/.env' ]; then \
 		echo 'Copying src/.env file...'; \
-		cp .src/env.example src/.env; \
+		cp src/.env.example src/.env; \
 	fi;
 	@if [ ! -f 'docker-compose.yml' ]; then \
 		echo 'Copying docker-compose.yml file...'; \

README.md

@@ -26,7 +26,9 @@ Run `make build` to build both Go applications server and storage.
 
 #### Usage
 
-The URL you want to load. Returns HTML by default.
+To run docker compose stack just run `make up`.
+
+To prerender some URL you need to specify it as a query parameter, like this:
 
 ```
 http://localhost:3000/render?url=https://www.example.com/

docker-compose.example.yml

@@ -4,15 +4,18 @@ services:
   server:
     build:
       context: ./
-      dockerfile: ./build/server/Dockerfile
+      dockerfile: ./docker/server/Dockerfile
+    environment:
+      STORAGE_URL: 'storage:50051'
+      PAGE_WAIT_TIME: 5
     ports:
-      - '${STORAGE_PORT}:50051'
-    depends_on:
+      - '${SERVER_PORT}:3000'
+    links:
       - storage
 
   storage:
     build:
       context: ./
-      dockerfile: ./build/storage/Dockerfile
+      dockerfile: ./docker/storage/Dockerfile
     ports:
-      - '${SERVER_PORT}:3000'
+      - '${STORAGE_PORT}:50051'

build/server/Dockerfile docker/server/Dockerfilebuild/server/Dockerfile renamed to docker/server/Dockerfile

@@ -4,7 +4,7 @@ RUN apk add chromium
 
 WORKDIR /app
 
-COPY ../../src /app
+COPY ./src /app
 
 RUN go build -o prerender ./cmd/server/main.go
 

build/storage/Dockerfile docker/storage/Dockerfilebuild/storage/Dockerfile renamed to docker/storage/Dockerfile

@@ -2,7 +2,7 @@ FROM golang:1.16-alpine
 
 WORKDIR /app
 
-COPY ../../src /app
+COPY ./src /app
 
 RUN go build -o storage ./cmd/storage/main.go