Compare commits

...

26 Commits

Author SHA1 Message Date
nathalie 9bf68050a7 merged from server 2023-06-07 22:21:21 -03:00
nathalie 615c9427b9 merge from server 2023-06-07 22:20:36 -03:00
nathalie 3203f48f76 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2023-05-10 12:15:04 -03:00
nathalie 55a94cb05b Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2023-04-10 16:16:10 -03:00
nathalie 835cb14042 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2023-04-10 16:07:35 -03:00
nathalie 13a445ef64 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2
Arreglado bug de bonos de ollas
2023-03-20 21:29:12 -03:00
nathalie ee7cdc8d10 Config 2023-03-20 21:27:25 -03:00
nathalie 9e55955970 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2023-03-08 15:35:57 -03:00
nathalie a340647df4 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2023-01-11 08:15:28 -03:00
nathalie b56d82fff1 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2023-01-11 07:55:08 -03:00
nathalie 78a5e8ad61 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-12-07 06:26:08 -03:00
nathalie f9f72cf830 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-11-13 21:40:47 -03:00
nathalie 1b519ca440 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-11-08 15:56:50 -03:00
nathalie 426052ba09 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-11-08 14:34:17 -03:00
nathalie e0d5bc5739 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-10-04 12:51:08 -03:00
nathalie cdb8522f65 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-09-07 08:15:47 -03:00
nathalie 7468ca9086 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-09-05 23:21:12 -03:00
nathalie 50cdbe57e8 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-09-05 23:12:50 -03:00
nathalie 6a00c6db22 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-08-09 23:15:07 -03:00
nathalie 75401556aa Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-07-06 18:39:34 -03:00
nathalie 33d59073e3 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-07-06 17:30:54 -03:00
nathalie b733100269 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-06-11 11:09:06 -03:00
nathalie c8768665e0 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-06-08 22:39:47 -03:00
nathalie 509ceaeefe Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-06-08 20:15:09 -03:00
nathalie 9e554b0a65 Merge branch 'master' of https://git.mps.org.uy/nathalie/pedi2 2022-06-08 18:31:42 -03:00
Felix a9bb6df711 arreglos del docker-compose.yml referentes al deploy en prod 2022-05-19 14:46:30 -03:00
6 changed files with 57 additions and 35133 deletions

2
composer.lock generated
View File

@ -5964,5 +5964,5 @@
"php": "^7.2.5|^8.0"
},
"platform-dev": [],
"plugin-api-version": "2.3.0"
"plugin-api-version": "2.1.0"
}

View File

@ -4,7 +4,7 @@ services:
build:
args:
user: www
uid: 1000
uid: ${USERID}
context: ./
dockerfile: Dockerfile
image: laravel-image
@ -56,4 +56,4 @@ networks:
#Volumes
volumes:
dbdata:
driver: local
driver: local

50
docker-ps.txt Normal file
View File

@ -0,0 +1,50 @@
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
0be94811453f bc48a6b1eec1 "/bin/sh -c 'apt-get…" 3 days ago Exited (100) 3 days ago festive_poitras
20904ea983a8 bc48a6b1eec1 "/bin/sh -c 'apt-get…" 3 days ago Exited (100) 3 days ago nifty_antonelli
eb71d65b34cc odoo:15 "/entrypoint.sh odoo" 6 weeks ago Up 6 days 0.0.0.0:8069->8069/tcp, 8071-8072/tcp odoo_bar_web_1
6b08d5b023b7 postgres:latest "docker-entrypoint.s…" 6 weeks ago Up 6 weeks 0.0.0.0:32775->5432/tcp odoo_bar_db_1
2be39cf0f208 wordpress:latest "docker-entrypoint.s…" 2 months ago Up 2 months 0.0.0.0:8007->80/tcp wordpress-mps_wordpress_1
1fb3ab9d5196 mariadb:10.3 "docker-entrypoint.s…" 2 months ago Up 2 months 3306/tcp wordpress-mps_db_1
62d94ac320a9 wordpress:cli-php8.0 "docker-entrypoint.s…" 2 months ago Exited (1) 2 months ago wordpress-mps_wpcli_1
dfa0be51db2f mysql:5.7 "docker-entrypoint.s…" 6 months ago Up 4 months 33060/tcp, 0.0.0.0:33060->3306/tcp pedi2-db
d2261994fbbb nginx:alpine "/docker-entrypoint.…" 6 months ago Up 4 months 0.0.0.0:8903->80/tcp pedi2-nginx
8dfd4713c569 laravel-image "docker-php-entrypoi…" 6 months ago Up 4 months 9000/tcp pedi2-app
1717f2e0e075 collabora/code:latest "/start-collabora-on…" 6 months ago Up 4 months 0.0.0.0:9980->9980/tcp collabora
949c45e8e331 nginx:alpine "/docker-entrypoint.…" 11 months ago Up 4 months 0.0.0.0:8902->80/tcp planifibot-nginx
855c759a117d 70bc6d959246 "docker-php-entrypoi…" 11 months ago Up 4 months 9000/tcp planifibot-app
f8591a57bab7 mysql:5.7 "docker-entrypoint.s…" 11 months ago Up 4 months 33060/tcp, 0.0.0.0:3316->3306/tcp planifibot-db
a7de86736ea4 akaunting/akaunting:es "/usr/local/bin/akau…" 12 months ago Exited (0) 8 months ago akaunting
0f4753ad709d mariadb "docker-entrypoint.s…" 12 months ago Exited (0) 8 months ago akaunting-db
7dab3c403e21 127.0.0.1:5000/mps/planifibot:latest "docker-php-entrypoi…" 12 months ago Exited (255) 12 months ago 0.0.0.0:8044->80/tcp planifibot
5880418fe8df 105826cada74 "docker-php-entrypoi…" 12 months ago Exited (255) 12 months ago 0.0.0.0:8044->80/tcp admiring_lumiere
8fd9068db7ed 592f6de18841 "docker-php-entrypoi…" 12 months ago Exited (0) 12 months ago tender_kare
db313e1dc227 72ba750ea9de "/bin/sh -c 'chown -…" 12 months ago Exited (1) 12 months ago pedantic_torvalds
4bd63fb01f80 8e2bc9d43c26 "/bin/sh -c 'chown -…" 12 months ago Exited (1) 12 months ago stoic_goldstine
8181000e76cc 1ed58aad8567 "/bin/sh -c 'docker-…" 12 months ago Exited (1) 12 months ago lucid_lalande
ec7da80bde1a b042c91004f0 "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago keen_mendel
43fd36cd860f b042c91004f0 "/bin/sh -c 'docker-…" 12 months ago Exited (1) 12 months ago jovial_khayyam
02a551fc62b5 b042c91004f0 "/bin/sh -c 'docker-…" 12 months ago Exited (1) 12 months ago heuristic_curie
47f377f81a3e 1b37a536c088 "/bin/sh -c 'apt-get…" 12 months ago Exited (1) 12 months ago laughing_franklin
0f63ee6729d9 1b37a536c088 "/bin/sh -c 'apt-get…" 12 months ago Exited (1) 12 months ago elegant_hoover
8a97c786f1e8 1b37a536c088 "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago distracted_yonath
d4c7f0f8b235 1b37a536c088 "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago vigilant_brown
a6d3cf25487e 80bfd1c2ffed "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago dazzling_williams
50030ac55043 80bfd1c2ffed "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago pedantic_lovelace
0ba2516ca8bd 1e9cc426f6db "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago suspicious_merkle
506eb5744961 1e9cc426f6db "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago stupefied_curie
29a25c955eef 1e9cc426f6db "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago competent_greider
bcbd4a6e70fc 1e9cc426f6db "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago condescending_chaum
0ff1e51bf0c5 1e9cc426f6db "/bin/sh -c 'apt-get…" 12 months ago Exited (100) 12 months ago eager_morse
4b200797fbb8 9ff09bb3bbaf "/bin/sh -c 'apk add…" 12 months ago Exited (127) 12 months ago trusting_euler
4630e65da875 38b8d34febc3 "/bin/sh -c 'docker-…" 12 months ago Exited (2) 12 months ago pensive_khorana
31bc5cbeebda 38b8d34febc3 "/bin/sh -c 'docker-…" 13 months ago Exited (2) 13 months ago elated_chatterjee
dcbaf807509c c2521253d4dc "/bin/sh -c 'docker-…" 13 months ago Exited (2) 13 months ago mystifying_cohen
a8d287e4972e c2521253d4dc "/bin/sh -c 'docker-…" 13 months ago Exited (2) 13 months ago adoring_boyd
57e55bd140e5 919da407c087 "/bin/sh -c 'apt-get…" 13 months ago Exited (100) 13 months ago blissful_turing
16759118d07b 919da407c087 "/bin/sh -c 'apt-get…" 13 months ago Exited (100) 13 months ago modest_edison
686e965026ac 919da407c087 "/bin/sh -c 'apt-get…" 13 months ago Exited (100) 13 months ago upbeat_khorana
e6a4f4e0bc55 919da407c087 "/bin/sh -c 'apt-get…" 13 months ago Exited (100) 13 months ago inspiring_lovelace
d19e81ca0ad2 34258187e19e "/bin/sh -c 'wget -q…" 17 months ago Exited (127) 17 months ago hardcore_lederberg
0d3305ea4c5d fc0cc68061fd "/bin/sh -c 'apt-get…" 17 months ago Exited (2) 17 months ago epic_einstein
1f0cc817b5f9 fc0cc68061fd "/bin/sh -c 'apt-get…" 17 months ago Exited (2) 17 months ago flamboyant_jang
ec330033c36f mariadb:10.3 "docker-entrypoint.s…" 22 months ago Exited (137) 17 months ago akaunting_db_1

14183
public/css/app.css vendored

File diff suppressed because one or more lines are too long

20951
public/js/app.js vendored

File diff suppressed because one or more lines are too long

0
tee Normal file
View File