Merge remote-tracking branch 'mroote/develop' into Feature/Update-adminLTE

Author: knoxfighter

.gitignore

@@ -16,3 +16,4 @@ mix-manifest.json
 /app/**/vendor/
 /app/*.js*
 /app/*.css*
+.vscode

.travis.yml

@@ -1,21 +1,22 @@
-language: go
-os:
- - linux
- - windows
-
-go:
- - 1.10.x
- - 1.11.x
- - 1.12.x
- - 1.x
-
-install:
-  - go get github.com/apexskier/httpauth
-  - go get github.com/go-ini/ini
-  - go get github.com/gorilla/mux
-  - go get github.com/hpcloud/tail
-  - go get github.com/gorilla/websocket
-  - go get github.com/majormjr/rcon
-
-script:
- - go test -v ./...
+jobs:
+  include:
+    - stage: deploy
+      go: 1.x
+      language: minimal
+      before_install:
+        - docker build -f "docker/Dockerfile-build" -t factorio-server-manager docker
+      script:
+        - mkdir /home/travis/build/mroote/build
+        - docker run -t -e FAC_BRANCH=$TRAVIS_BRANCH -v /home/travis/build/mroote/build:/build factorio-server-manager
+        - mv /home/travis/build/mroote/build/factorio-server-manager-linux.zip /home/travis/factorio-server-manager-linux-${TRAVIS_TAG}.zip
+        - mv /home/travis/build/mroote/build/factorio-server-manager-windows.zip /home/travis/factorio-server-manager-windows-${TRAVIS_TAG}.zip
+      deploy:
+        provider: releases
+        api_key: "${GITHUB_TOKEN}"
+        draft: true
+        skip_cleanup: true
+        on:
+          tags: true
+        file:
+          - /home/travis/factorio-server-manager-linux-${TRAVIS_TAG}.zip
+          - /home/travis/factorio-server-manager-windows-${TRAVIS_TAG}.zip

Makefile

@@ -12,41 +12,41 @@ endif
 
 build: $(release)
 
-$(shell mkdir -p build)
-build/factorio-server-manager-%.zip: app/bundle.js factorio-server-manager-%
+build/factorio-server-manager-%.zip: clean app/bundle factorio-server-manager-%
+	@mkdir -p build/
 	@echo "Packaging Build - $@"
 	@cp -r app/ factorio-server-manager/
 	@cp conf.json.example factorio-server-manager/conf.json
 	@zip -r $@ factorio-server-manager > /dev/null
-	@rm -r factorio-server-manager
 
 app/bundle:
 	@echo "Building Frontend"
 	@npm install && npm run build
 
-factorio-server-manager-linux: godeps
+factorio-server-manager-linux:
 	@echo "Building Backend - Linux"
-	@GOPATH="${GOPATH}:${PDW}"
 	@mkdir -p factorio-server-manager
-	@GOOS=linux GOARCH=amd64 go build -o factorio-server-manager/factorio-server-manager ./src
+	@cd src; \
+	GOOS=linux GOARCH=amd64 go build -o ../factorio-server-manager/factorio-server-manager .
 
-factorio-server-manager-windows: godeps
+factorio-server-manager-windows:
 	@echo "Building Backend - Windows"
-	@GOPATH="${GOPATH}:${PDW}"
 	@mkdir -p factorio-server-manager
-	@GOOS=windows GOARCH=386 go build -o factorio-server-manager/factorio-server-manager.exe ./src
-
-godeps:
-	@echo "Installing Packages"
-	@cat gopkglist | xargs go get
+	@cd src; \
+	GOOS=windows GOARCH=386 go build -o ../factorio-server-manager/factorio-server-manager.exe .
 
 gen_release: build/factorio-server-manager-linux.zip build/factorio-server-manager-windows.zip
 	@echo "Done"
 
 clean:
 	@echo "Cleaning"
-	@rm -r build/
-	@rm app/bundle.js
-	@rm app/bundle.css
-	@rm app/fonts/vendor
-	@rm app/images/vendor
+	@-rm -r build/
+	@-rm app/bundle.js
+	@-rm app/bundle.js.map
+	@-rm app/style.css
+	@-rm app/style.css.map
+	@-rm -r app/fonts/vendor/
+	@-rm -r app/images/vendor/
+	@-rm -r node_modules/
+	@-rm -r pkg/
+	@-rm -r factorio-server-manager

README.md

@@ -43,7 +43,7 @@ This tool runs on a Factorio server and allows management of the Factorio server
 4. Visit [localhost:8080](localhost:8080) in your web browser.
 
 ## Usage
-Run the UI server and  specify the directory of your Factorio server installation and the interface to run the HTTP server on.  Edit the conf.json file with your desired credentials for authentication.
+Run the UI server and specify the directory of your Factorio server installation and the interface to run the HTTP server on.  Edit the conf.json file with your desired credentials for authentication.
 ```
 Usage of ./factorio-server-manager:
   -bin string
@@ -60,11 +60,21 @@ Usage of ./factorio-server-manager:
     	Maximum filesize for uploaded files (default 20MB). (default 20971520)
   -port string
     	Specify a port for the server. (default "8080")
-
+  -glibc-custom string 
+        Specify if custom glibc is used (default false) [true/false]
+  -glibc-loc string
+        Path to the glibc ld.so file (default "/opt/glibc-2.18/lib/ld-2.18.so")
+  -glibc-lib-loc
+        Path to the glibc lib folder (default "/opt/glibc-2.18/lib")
+        
 Example:
 
 ./factorio-server-manager --dir /home/user/.factorio --host 10.0.0.1
 
+Custom glibc example:
+
+./factorio-server-manager --dir /home/user/.factorio --host 10.0.0.1 --glibc-custom true --glibc-loc /opt/glibc-2.18/lib/ld-2.18.so --glibc-lib-loc /opt/glibc-2.18/lib
+
 ```
 
 ## Manage Factorio Server
@@ -89,8 +99,8 @@ It also acts as the webserver to serve the front end react application
 All api actions are accessible with the /api route.  The frontend is accessible from /.
 
 #### Requirements
-+ Go 1.7
-+ NodeJS 4.2.6
++ Go 1.11
++ NodeJS
 
 #### Building Releases
 Creates a release zip for windows and linux: (this will install the dependencies listed in gopkgdeps)
@@ -121,7 +131,7 @@ make app/bundle
 ```
 
 ##### For development
-The frontend is completly build by npm with laravel-mix. All plugins are buld into the compiled files. No plugins need to be load fro external sources.
+The frontend is completely build by npm with laravel-mix. All plugins are build into the compiled files. No plugins need to be load fro external sources.
 
 It has different variants to build the frontend, provided by laravel-mix:
 - `npm run dev` Build the code for development. This will also generate map-files, so the browser, can show, what line and file causes the output.
@@ -134,46 +144,31 @@ In every of those cases, also images and fonts will be copied to the app-folder.
 1. Download the latest release source zip file
   * [https://github.com/mroote/factorio-server-manager/releases](https://github.com/mroote/factorio-server-manager/releases)
 2. Unzip the Factorio Standalone server and move it to a known directory.
-3. Download and install Go 1.7 or newer. https://golang.org/dl/
-4. Download and install NodeJS 4.2.6 64-bit or 32-bit depending on your operating system, if unsure download 32-bit
-  * https://nodejs.org/download/release/v4.2.6/node-v4.2.6-x64.msi 64-bit
-  * https://nodejs.org/download/release/v4.2.6/node-v4.2.6-x86.msi 32-bit
-5. Download and install NVM, when asked if you want it to use NodeJS 4.2.6 accept
-  * https://github.com/coreybutler/nvm-windows/releases/download/1.1.1/nvm-setup.zip
-6. You will need to setup GOPATH in environmental settings in windows. You will want to go into Control Panel\System and Security\System From there on the left hand side click "Advanced system settings". A window will open and you need to click Environment Variables.
-7. Under System Variables click New. For Variable name use GOPATH and Variable value C:\Go\
+3. Download and install Go 1.11 or newer. https://golang.org/dl/
+4. Download and install NodeJS 64-bit or 32-bit depending on your operating system, most users need 64-bit nowadays.
+  * https://nodejs.org/dist/v12.13.0/node-v12.13.0-x64.msi 64-bit
+  * https://nodejs.org/dist/v12.13.0/node-v12.13.0-x86.msi 32-bit
 
 Once everything is installed and ready to go you will need to compile the source for windows
 
 1. Open the folder where ever you unzipped from step #2 above.
 2. My folder structure is like this "C:\FS\factorio-server-manager\" C:\FS is where my factorio files are located C:\FS\factorio-server-manager\ is where the server manager files are.
-3. You will now need to install some dependencies for Go. You will need to open up a command prompt and one at a time type each of these and hit enter before typing the next one.
-
-```
-go get github.com/apexskier/httpauth
-go get github.com/go-ini/ini
-go get github.com/gorilla/mux
-go get github.com/hpcloud/tail
-go get github.com/gorilla/websocket
-go get github.com/majormjr/rcon
-```
-
-3. Now you will want to go into the src folder for example "C:\FS\factorio-server-manager\src" once there hold down left shift and right click an empty area of the folder. Then click "Open command windows here"
+3. Now you will want to go into the src folder for example "C:\FS\factorio-server-manager\src" once there hold down shift and right click an empty area of the folder. Then click "Open command windows here"
 4. Type this into the command prompt then hit enter:
 
 ```
 go build
 ```
 
 5. Once finished you will now see src.exe or src file inside the folder. You need to move that file to the C:\FS\factorio-server-manager\ or the folder that is before your src folder.
-6. From here you need to build the web front-end by going into your ui folder for me its C:\FS\factorio-server-manager\ui\ and again hold shift and left click in an empty area then select open command prompt here. You then need to type this:
+6. From here you need to build the web front-end. Again hold shift and right click in an empty area then select open command prompt here. You then need to type this:
 
 ```
  npm install
  npm run build
 ```
 
-7. Now execute the src file created in step #4 above
+7. Now execute the src file created in step #4 above. You have to specify the directory, where the factorio-server is located, as parameter. More about the parameter under [Usage](#Usage) 
 8. You can now Visit [localhost:8080](localhost:8080) in your web browser to start using the Factorio server Manager
 
 ## Contributing
@@ -188,7 +183,7 @@ go build
 * **Mitch Roote** - [roote.ca](https://roote.ca)
 
 ## Special Thanks
-- **[All Contributions]**(https://github.com/mroote/factorio-server-manager/graphs/contributors)
+- **[All Contributions](https://github.com/mroote/factorio-server-manager/graphs/contributors)**
 - **mickael9** for reverseengineering the factorio-save-file: https://forums.factorio.com/viewtopic.php?f=5&t=8568#
 
 ## License

docker/Dockerfile

@@ -1,10 +1,8 @@
 # glibc is required for Factorio Server binaries to run
 FROM frolvlad/alpine-glibc
 
-MAINTAINER Mitch Roote <mitch@r00t.ca>
-
 ENV FACTORIO_VERSION=latest \
-    MANAGER_VERSION=0.8.1 \
+    MANAGER_VERSION=0.8.2 \
     ADMIN_PASSWORD=factorio
 
 VOLUME /opt/factorio/saves /opt/factorio/mods /opt/factorio/config /security
@@ -16,7 +14,8 @@ WORKDIR /opt/
 RUN curl -s -L -S -k https://www.factorio.com/get-download/$FACTORIO_VERSION/headless/linux64 -o /tmp/factorio_$FACTORIO_VERSION.tar.xz && \
     tar Jxf /tmp/factorio_$FACTORIO_VERSION.tar.xz && \
     rm /tmp/factorio_$FACTORIO_VERSION.tar.xz && \
-    curl -s -L -S -k https://github.com/mroote/factorio-server-manager/releases/download/$MANAGER_VERSION/factorio-server-manager-linux.zip --cacert /opt/github.pem -o /tmp/factorio-server-manager-linux_$MANAGER_VERSION.zip && \
+    curl -sLSk https://github.com/mroote/factorio-server-manager/releases/download/$MANAGER_VERSION/factorio-server-manager-linux-${MANAGER_VERSION}.zip \
+     --cacert /opt/github.pem -o /tmp/factorio-server-manager-linux_$MANAGER_VERSION.zip && \
     unzip -qq /tmp/factorio-server-manager-linux_$MANAGER_VERSION.zip && \
     rm /tmp/factorio-server-manager-linux_$MANAGER_VERSION.zip && \
     mkdir -p /run/nginx && \

docker/Dockerfile-build

@@ -0,0 +1,20 @@
+FROM alpine:latest
+
+RUN apk add --no-cache git make musl-dev go nodejs npm zip
+
+ENV FAC_BRANCH=develop
+ENV GOROOT /usr/lib/go
+ENV GOPATH /go
+ENV PATH /go/bin:$PATH
+ENV FAC_ROOT /go/src/factorio-server-manager
+
+COPY build.sh /usr/local/bin/build.sh
+
+RUN mkdir -p ${GOPATH}/bin
+RUN chmod u+x /usr/local/bin/build.sh
+
+WORKDIR $FAC_ROOT
+
+VOLUME /build
+
+CMD ["/usr/local/bin/build.sh"]

docker/Makefile

@@ -5,16 +5,14 @@ SECURITY_PATH ?= $(FACTORIO_PATH)/security
 SAVES_PATH ?= $(FACTORIO_PATH)/saves
 MODS_PATH ?= $(FACTORIO_PATH)/mods
 PORT_FORWARD ?= -p 80:80 -p 443:443 -p 34197:34197/udp
+FACTORIO_BRANCH ?= develop
 
 build:
+	docker build --build-arg FAC_BRANCH=$FACTORIO_BRANCH -f Dockerfile-build -t fsm-build .
 	docker build -t factorio-server-manager .
 
 logs:
-	docker logs factorio-server
-	echo "Nginx Access Logs"
-	docker exec -it factorio-server cat /var/log/nginx/access.log
-	echo "Nginx Error Logs"
-	docker exec -it factorio-server cat /var/log/nginx/error.log
+	docker logs factorio-server -f
 
 run:
 	docker run -d --name factorio-server -v $(SECURITY_PATH):/security -v $(SAVES_PATH):/opt/factorio/saves -v $(MODS_PATH):/opt/factorio/mods $(PORT_FORWARD) factorio-server-manager
@@ -25,3 +23,5 @@ stop:
 
 clean:
 	docker rmi factorio-server-manager
+	docker stop fsm-build
+	docker rmi fsm-build

docker/build.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+echo "Cloning ${FAC_BRANCH}"
+git clone -b ${FAC_BRANCH} https://github.com/mroote/factorio-server-manager.git ${FAC_ROOT}
+echo "Creating build..."
+make gen_release
+echo "Copying build artifacts..."
+cp -v build/* /build/

gopkglist

@@ -46,6 +46,7 @@ func OpenArchiveFile(path string, name string) (r io.ReadCloser, err error) {
 		}
 	}
 
+	archive.Close()
 	return nil, errors.New("file not found")
 }