Skip to content

Commit f0cbdc2

Browse files
Merge branch 'master' into develop
2 parents 83e9642 + d37253e commit f0cbdc2

File tree

108 files changed

+6586
-8197
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+6586
-8197
lines changed

.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,7 @@
11
docker-data
2+
docker-data/public-files
3+
docker-data/db-data
4+
docker-data/private-files
5+
docker-data/*
6+
dumps/*
7+
dumps

.github/workflows/ci.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: ci
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*.*.*"
7+
branches:
8+
- "master"
9+
- "develop"
10+
11+
jobs:
12+
docker:
13+
runs-on: ubuntu-latest
14+
steps:
15+
-
16+
name: Checkout
17+
uses: actions/checkout@v3
18+
-
19+
name: Docker meta
20+
id: meta
21+
uses: docker/metadata-action@v4
22+
with:
23+
images: |
24+
docker.io/hacklab/mapas-es
25+
tags: |
26+
type=ref,event=branch
27+
type=semver,pattern={{version}}
28+
type=semver,pattern={{major}}.{{minor}}
29+
type=semver,pattern={{major}}
30+
-
31+
name: Set up QEMU
32+
uses: docker/setup-qemu-action@v2
33+
-
34+
name: Set up Docker Buildx
35+
uses: docker/setup-buildx-action@v2
36+
-
37+
name: Login to Docker Hub
38+
if: github.event_name != 'pull_request'
39+
uses: docker/login-action@v2
40+
with:
41+
username: ${{ secrets.DOCKERHUB_USERNAME }}
42+
password: ${{ secrets.DOCKERHUB_TOKEN }}
43+
44+
- name: Initialize and update submodules
45+
run: |
46+
git submodule update --init --recursive
47+
-
48+
name: Build and push
49+
uses: docker/build-push-action@v4
50+
with:
51+
file: ./docker/Dockerfile
52+
context: .
53+
push: ${{ github.event_name != 'pull_request' }}
54+
tags: ${{ steps.meta.outputs.tags }}
55+
labels: ${{ steps.meta.outputs.labels }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ docker-data/db-data
66
docker-data/private-files
77
docker-data/*
88
dumps/*
9+
mapasculturais.prod.env

.gitmodules

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
1-
[submodule "plugins/AldirBlanc"]
2-
path = plugins/AldirBlanc
3-
url = https://github.com/mapasculturais/plugin-AldirBlanc.git
41
[submodule "plugins/MultipleLocalAuth"]
52
path = plugins/MultipleLocalAuth
63
url = https://github.com/mapasculturais/plugin-MultipleLocalAuth
7-
[submodule "plugins/AldirBlancRedirects"]
8-
path = plugins/AldirBlancRedirects
9-
url = https://github.com/mapasculturais/plugin-AldirBlancRedirects.git
10-
[submodule "plugins/AldirBlancDataprev"]
11-
path = plugins/AldirBlancDataprev
12-
url = https://github.com/mapasculturais/plugin-AldirBlancDataprev
13-
[submodule "plugins/AldirBlancValidador"]
14-
path = plugins/AldirBlancValidador
15-
url = https://github.com/mapasculturais/plugin-AldirBlancValidador
164
[submodule "plugins/RegistrationPayments"]
175
path = plugins/RegistrationPayments
186
url = https://github.com/mapasculturais/plugin-RegistrationPayments
19-
[submodule "plugins/AldirBlancValidadorFinanceiro"]
20-
path = plugins/AldirBlancValidadorFinanceiro
21-
url = https://github.com/mapasculturais/plugin-AldirBlancValidadorFinanceiro
22-
[submodule "plugins/AldirBlancValidadorRecurso"]
23-
path = plugins/AldirBlancValidadorRecurso
24-
url = https://github.com/mapasculturais/plugin-AldirBlancValidadorRecurso
25-
[submodule "plugins/MapasNetwork"]
26-
path = plugins/MapasNetwork
27-
url = https://github.com/mapasculturais/plugin-MapasNetwork
28-
[submodule "plugins/LocationPatch"]
29-
path = plugins/LocationPatch
30-
url = https://github.com/mapasculturais/plugin-LocationPatch
317
[submodule "plugins/MapasBlame"]
328
path = plugins/MapasBlame
33-
url = git@github.com:mapasculturais/plugin-MapasBlame.git
9+
url = https://github.com/mapasculturais/plugin-MapasBlame.git
10+
[submodule "plugins/Zammad"]
11+
path = plugins/Zammad
12+
url = https://github.com/mapasculturais/plugin-Zammad.git
13+
[submodule "plugins/AdminLoginAsUser"]
14+
path = plugins/AdminLoginAsUser
15+
url = https://github.com/mapasculturais/plugin-AdminLoginAsUser
16+
[submodule "plugins/Analytics"]
17+
path = plugins/Analytics
18+
url = https://github.com/mapasculturais/plugin-Analytics.git
19+
[submodule "plugins/Accessibility"]
20+
path = plugins/Accessibility
21+
url = https://github.com/mapasculturais/plugin-Accessibility.git
22+
[submodule "plugins/SpamDetector"]
23+
path = plugins/SpamDetector
24+
url = https://github.com/mapasculturais/plugin-SpamDetector.git
25+
[submodule "plugins/ValuersManagement"]
26+
path = plugins/ValuersManagement
27+
url = https://github.com/mapasculturais/plugin-ValuersManagement.git
28+
[submodule "plugins/ClaimForm"]
29+
path = plugins/ClaimForm
30+
url = https://github.com/mapasculturais/plugin-ClaimForm.git

compose/common/branchMap.csv

Lines changed: 0 additions & 157 deletions
This file was deleted.

compose/common/config.d/0.main.php

Lines changed: 0 additions & 45 deletions
This file was deleted.

compose/common/config.d/00.timezone.php

Lines changed: 0 additions & 3 deletions
This file was deleted.

compose/common/config.d/lgpd.php

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)