Reorder port usage
Signed-off-by: Thomas Klaehn <thomas.klaehn@perinet.io>
This commit is contained in:
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
										Normal file
									
								
							@@ -0,0 +1,2 @@
 | 
				
			|||||||
 | 
					bin/
 | 
				
			||||||
 | 
					build/
 | 
				
			||||||
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -16,7 +16,7 @@ all: service
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
.PHONY: service
 | 
					.PHONY: service
 | 
				
			||||||
service:
 | 
					service:
 | 
				
			||||||
	mkdir -p bin
 | 
						mkdir -p build/bin
 | 
				
			||||||
	cd src && go build -o ../$(BIN_FILE)
 | 
						cd src && go build -o ../$(BIN_FILE)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.PHONY: clean
 | 
					.PHONY: clean
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -5,7 +5,7 @@ services:
 | 
				
			|||||||
    image: octoprint/octoprint
 | 
					    image: octoprint/octoprint
 | 
				
			||||||
    restart: unless-stopped
 | 
					    restart: unless-stopped
 | 
				
			||||||
    ports:
 | 
					    ports:
 | 
				
			||||||
      - 80:80
 | 
					      - 8082:80
 | 
				
			||||||
    devices:
 | 
					    devices:
 | 
				
			||||||
    # use `python -m serial.tools.miniterm` to see what the name is of the printer, this requires pyserial
 | 
					    # use `python -m serial.tools.miniterm` to see what the name is of the printer, this requires pyserial
 | 
				
			||||||
      - /dev/ttyUSB0:/dev/ttyUSB0
 | 
					      - /dev/ttyUSB0:/dev/ttyUSB0
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,7 +34,7 @@ func main() {
 | 
				
			|||||||
	apiservice_printer.AddHandler()
 | 
						apiservice_printer.AddHandler()
 | 
				
			||||||
	apiservice_relay.AddHandler()
 | 
						apiservice_relay.AddHandler()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	port := ":5005"
 | 
						port := ":80"
 | 
				
			||||||
	http.Handle("/", http.FileServer(http.Dir(webui_path)))
 | 
						http.Handle("/", http.FileServer(http.Dir(webui_path)))
 | 
				
			||||||
	logger.Fatal(http.ListenAndServe(port, nil))
 | 
						logger.Fatal(http.ListenAndServe(port, nil))
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -138,7 +138,7 @@
 | 
				
			|||||||
                        <td id="container_status"></td>
 | 
					                        <td id="container_status"></td>
 | 
				
			||||||
                    </tr>
 | 
					                    </tr>
 | 
				
			||||||
                </table>
 | 
					                </table>
 | 
				
			||||||
                <a href="http://p4:80" target="_blank">Octoprint</a>
 | 
					                <a href="http://p4:8082" target="_blank">Octoprint</a>
 | 
				
			||||||
                <br>
 | 
					                <br>
 | 
				
			||||||
                <a href="http://p4:8080" target="_blank">Camera</a>
 | 
					                <a href="http://p4:8080" target="_blank">Camera</a>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user