Compare commits

...

17 Commits

Author SHA1 Message Date
d6ad584a84 Merge pull request 'Updated README within Fork1' (#3) from TestOrginization/GitTestFork1:updates-within-fork1 into main
Reviewed-on: #3
Fork1 has updated ReadMe file. Merging.
2023-09-18 14:17:10 +00:00
b9cdb15b58 Updated README within Fork1 2023-09-18 15:11:08 +02:00
4504c07387 Merge pull request 'Updated firefox and added Readme' (#1) from Docker_new_networks into main
Reviewed-on: #1
2023-09-15 13:32:03 +00:00
b0e3ce34be Updated firefox and added Readme 2023-09-13 15:29:44 +02:00
sa6kad
686c20491b Adding portainer agent 2023-03-10 20:10:01 +01:00
7b4d8da577 Update 'gitea.yml' 2023-03-10 19:06:43 +00:00
df490d84c9 Added gitea 2023-03-10 18:59:05 +00:00
04491e66cb Merged master and 1clowd after resolving conflict 2023-03-10 15:56:04 +01:00
f62fe74b7a 1clowd branch: Added comments to modified lines 2023-03-10 15:26:08 +01:00
eae4aa5036 Added comments to modified lines 2023-03-10 15:24:57 +01:00
27c359f534 Modification of portainer for home server #2 2023-03-10 14:59:46 +01:00
d4b4a422d6 Modify portainer for home server 2023-03-10 14:57:24 +01:00
166a4e5dfe Ajust portainer for 1clowd server 2023-03-10 14:55:31 +01:00
71a031da14 Merge branch 'home' 2023-03-10 14:05:15 +01:00
154b95c927 Changed firefox IP and exposed port 2023-03-10 12:03:48 +01:00
762b73e8ec Changed portainer IP address to home network 2023-03-10 11:54:04 +01:00
06645a8d63 First real file. Docker-compose YML 2023-03-10 11:21:55 +01:00
7 changed files with 119 additions and 3 deletions

2
README.md Normal file
View File

@@ -0,0 +1,2 @@
Just a readme file.
However this line has been added in the Fork1

View File

@@ -1,2 +0,0 @@
File1: line 1
File1: line 2

View File

@@ -1 +0,0 @@
File2: line1

26
firefox.yml Normal file
View File

@@ -0,0 +1,26 @@
version: '3'
networks:
External:
external: true
AppsExternal:
external: true
services:
firefox:
image: lscr.io/linuxserver/firefox
container_name: firefox
environment:
- PUID=1002
- PGID=1002
- TZ=Europe/Stockholm
volumes:
- /home/ubuntu/docker_volumes/firefox/config:/config
ports:
- 4000:3000
shm_size: "1gb"
networks:
Apps:
ipv4_address: 10.23.0.222
AppsExternal:
restart: unless-stopped

53
gitea.yml Normal file
View File

@@ -0,0 +1,53 @@
version: "2"
networks:
behind_proxy:
external: true
postgress_db_net:
external: true
services:
gitea_app:
image: gitea/gitea:latest
container_name: gitea_app
environment:
- GITEA__database__DB_TYPE=postgres
- GITEA__database__HOST=gitea_pg_db:5432
- GITEA__database__NAME=gitea
- GITEA__database__USER=gitea
- GITEA__database__PASSWD=gitea
volumes:
- ~/docker_volumes/gitea/data:/data
# - ~/docker_volumes/gitea/data:/var/lib/gitea
- ~/docker_volumes/gitea/config:/etc/gitea
- /etc/timezone:/etc/timezone:ro
- /etc/localtime:/etc/localtime:ro
ports:
- "3333:3000"
- "2222:22"
- "22222:2222"
networks:
behind_proxy:
postgress_db_net:
restart: unless-stopped
# depends_on:
# - db
#
# Separated DB, rollback this. Keep app and DB within the same compose project.
# Move compose and docker volumes into same folde. Use git to track changes in the compose files.
#
# db:
# image: postgres:14-alpine
# container_name: gitea_db
# restart: always
# environment:
# - POSTGRES_USER=gitea
# - POSTGRES_PASSWORD=gitea
# - POSTGRES_DB=gitea
# volumes:
# - ~/docker_volumes/postgres:/var/lib/postgresql/data
# networks:
# behind_proxy:
# restart: unless-stopped

19
portainer.yml Normal file
View File

@@ -0,0 +1,19 @@
version: '3'
networks:
infra_out:
external: true
services:
portainer:
image: portainer/portainer-ce # This line was modified in 1clowd branch
container_name: portainer
volumes:
- /home/alexd/docker_volumes/portainer/data:/data
- /var/run/docker.sock:/var/run/docker.sock
ports:
- "9900:9000" # This line was modified in 1clowd branch
networks:
infra_out:
ipv4_address: 10.23.0.211 # This line was modified in 1clowd branch
restart: unless-stopped

View File

@@ -0,0 +1,19 @@
version: '3'
networks:
infra_out:
external: true
services:
portainer:
image: portainer/agent:latest
container_name: portainer-agent
volumes:
- ~/docker_volumes/portainer_agent/data:/data
- /var/run/docker.sock:/var/run/docker.sock
ports:
- "9001:9001"
networks:
infra_out:
ipv4_address: 10.23.0.10
restart: always