move static folder

Author: trinidz

.dockerignore

@@ -4,4 +4,6 @@ makefile
 .gitea/
 bin/
 sample.*
-db/
+db/
+.env
+static/qrcodes/

README.md

@@ -26,8 +26,11 @@ Prerequisites:
 mkdir rssnotes
 cd rssnotes
 ```
-2. Create a folder called `db`.
-
+2. Create two folders: `db` and `qrcodes`.
+```bash
+mkdir db
+mkdir qrcodes
+```
 3. Create a file called `logfile.log`.
 
 4. Create a file called `docker-compose.yml`.
@@ -50,9 +53,7 @@ cd rssnotes
 
 11. Copy and paste the contents from the [sample.seedrelays.json](https://github.com/trinidz/rssnotes/blob/main/sample.seedrelays.json) file into your `seedrelays.json` file. Save and exit the file.
 
-12. Run `docker-compose up -d` while in the `rssnotes` directory. This will start the rssnotes container in the background.
-
-12. Go to http://localhost:3334 in your browser.
+12. Run `docker-compose up -d` while in the `rssnotes` directory. This will start the rssnotes container in the background. Go to http://localhost:3334 in your browser.
 
 ## Run the relay as a service on your system
 1. Clone the repo and cd into the repo folder.

dockerfile

@@ -26,14 +26,15 @@ ENV LOGFILE_PATH="/app/logfile.log"
 ENV FRENSDATA_PATH="/app/users.json"
 ENV SEED_RELAYS_PATH="/app/seedrelays.json"
 ENV TEMPLATE_PATH="/app/templates"
-ENV STATIC_PATH="/app/templates/static"
-ENV QRCODE_PATH="/app/templates/static/qrcodes"
+ENV STATIC_PATH="/app/static"
+ENV QRCODE_PATH="/app/static/qrcodes"
 
 # Copy Go binary
 COPY --from=gobuilder /app/rssnotes /app/
 
 # Copy any necessary files like templates, static assets, etc.
 COPY --from=gobuilder /app/templates /app/templates
+COPY --from=gobuilder /app/static /app/static
 
 # Run the application
 CMD ["/app/rssnotes"]

main.go

@@ -40,8 +40,8 @@ type Settings struct {
 	SeedRelaysPath string `envconfig:"SEED_RELAYS_PATH" default:"./seedrelays.json"`
 	LogfilePath    string `envconfig:"LOGFILE_PATH" default:"./logfile.log"`
 	TemplatePath   string `envconfig:"TEMPLATE_PATH" default:"./templates"`
-	StaticPath     string `envconfig:"STATIC_PATH" default:"./templates/static"`
-	QRCodePath     string `envconfig:"QRCODE_PATH" default:"./templates/static/qrcodes"`
+	StaticPath     string `envconfig:"STATIC_PATH" default:"./static"`
+	QRCodePath     string `envconfig:"QRCODE_PATH" default:"./static/qrcodes"`
 
 	RsslayTagKey            string `envconfig:"RSSLAY_TAG_KEY" default:"rsslay"`
 	DefaultProfilePicUrl    string `envconfig:"DEFAULT_PROFILE_PICTURE_URL" default:"https://i.imgur.com/MaceU96.png"`

sample.docker-compose.yml

@@ -5,8 +5,9 @@ services:
 
     volumes:
       - "./.env:/.env"
-      - "./logfile.log:/app/logfile.log"
       - "./db:/app/db"
+      - "./qrcodes:/app/static/qrcodes"
+      - "./logfile.log:/app/logfile.log"
       - "./seedrelays.json:/app/seedrelays.json:ro"
 
     ports:

sample.env

@@ -9,5 +9,5 @@ RELAY_NAME="my-rssnotes-relay"
 #RELAY_DESCRIPTION="A relay for rss notes." 
 #RELAY_CONTACT="email@example.com" 
 #RELAY_ICON="https://fileserver.exapmle.com/icon.png" 
-#PORT="3334" 
+#PORT="3334"
 #MAX_NOTE_AGE_DAYS="90" #notes older than this many days will be deleted, disabled by default or if set to "0"