Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.git/
.github/
.idea/
*.sql
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
# Enviromental values for Makefile and for docker-compose.yml
#

PROJECT_NAME=

# Docker Compose project name
COMPOSE_PROJECT_NAME=asuntotuotanto

Expand All @@ -14,6 +16,8 @@ OC_DEPLOYMENT_CONFIG_NAME=asuntotuotanto-drupal-cron
# Local hostname
DRUPAL_HOSTNAME=asuntotuotanto.docker.so

COMPOSE_PROFILES=search

# Docker image
DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3

Expand Down
18 changes: 18 additions & 0 deletions .github/dependabot.yml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Please see the documentation for all configuration options:
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
version: 2
updates:
- package-ecosystem: "composer" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
allow:
# Update only direct dependencies. This reduces spam since most
# indirect dependencies are handles by update-config workflow.
- dependency-type: "direct"
ignore:
# Updated by update-config workflow
- dependency-name: "drupal/helfi_*"
- dependency-name: "drupal/hdbt*"
# Updated separately
- dependency-name: "drupal/core*"
36 changes: 36 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# [UHF-0000](https://helsinkisolutionoffice.atlassian.net/browse/UHF-0000)
<!-- What problem does this solve? -->

## What was done
<!-- Describe what was done -->

* This thing was fixed

## How to install

* Make sure your instance is up and running on correct branch.
* `git checkout UHF-0000_insert_correct_branch`
* `make fresh`
* Run `make drush-cr`

## How to test
<!-- Describe steps how to test the features, add as many steps as you want to be tested -->

* [ ] Check that this feature works
* [ ] Check that code follows our standards

## Continuous documentation
<!-- One of the checkboxes below needs to be checked like this: `[x]` (or click when not in edit mode) -->

* [ ] This feature has been documented/the documentation has been updated
* [ ] This change doesn't require updates to the documentation

## Translations
<!-- The checkbox below needs to be checked like this: `[x]` (or click when not in edit mode). Not needed if the translations were not affected. -->

* [ ] Translations have been added to .po -files and included in this PR

## Other PRs
<!-- For example an related PR in another repository -->

* Link to other PR
19 changes: 19 additions & 0 deletions .github/workflows/auto-release-pr.yml.dist
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
on:
push:
branches:
- dev
name: Automatic release PR
jobs:
release-pr:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Create pull request
run: |
gh pr create \
--base main \
--head dev \
--title "Dev to main" \
--body "Dev to main" || true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .platform/schema
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
15
1 change: 1 addition & 0 deletions .sonarcloud.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sonar.exclusions=public/modules/custom/**/tests/**
31 changes: 25 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,36 @@
PHONY :=
PROJECT_DIR := $(dir $(lastword $(MAKEFILE_LIST)))

# Colors
NO_COLOR=\033[0m
CYAN=\033[36m
GREEN=\033[0;32m
RED=\033[0;31m
YELLOW=\033[0;33m

ENV := local

# Include project env vars (if exists)
-include .env
-include .env.local

# Include druidfi/tools config
include $(PROJECT_DIR)/tools/make/Makefile
define step
@printf "\n⭐ ${YELLOW}${1}${NO_COLOR}\n"
endef

PHONY += help
help: ## List all make commands
$(call step,Available make commands:\n)
@cat $(MAKEFILE_LIST) | grep -e "^[a-zA-Z_\-]*: *.*## *" | awk 'BEGIN {FS = ":.*?## "}; {printf "${CYAN}%-30s${NO_COLOR} %s\n", $$1, $$2}'

# Include project specific make files (if they exist)
-include $(PROJECT_DIR)/tools/make/project/*.mk
# Allow projects to specify makefiles.
-include tools/make/project/*.mk

# Project specific overrides for variables (if they exist)
-include $(PROJECT_DIR)/tools/make/override.mk
include tools/make/docker.mk
include tools/make/composer.mk
include tools/make/drupal.mk
include tools/make/git.mk
include tools/make/theme.mk
include tools/make/qa.mk

.PHONY: $(PHONY)
6 changes: 6 additions & 0 deletions compose.ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
services:
app:
user: "1001:1001"
environment:
SYMFONY_DEPRECATIONS_HELPER: disabled
BROWSERTEST_OUTPUT_DIRECTORY: /app/results
27 changes: 27 additions & 0 deletions compose.override.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
services:
app:
environment:
PHP_SENDMAIL_PATH: /usr/sbin/sendmail -S host.docker.internal:1025 -t
ASU_ASUNTOTUOTANTO_URL: "https://asuntotuotanto.docker.so"

idp:
container_name: "${COMPOSE_PROJECT_NAME}-idp"
image: druidfi/saml-idp:1.19.1
environment:
SIMPLESAMLPHP_IDP_BASEURLPATH: "https://idp-${DRUPAL_HOSTNAME}/simplesaml/"
SIMPLESAMLPHP_SP_ENTITY_ID: "https://${DRUPAL_HOSTNAME}/saml/metadata"
SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE: "https://${DRUPAL_HOSTNAME}/saml/acs"
SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE: "https://${DRUPAL_HOSTNAME}/saml/logout"
volumes:
- ./conf/local_idp_authsources.php:/var/www/simplesamlphp/config/authsources.php
labels:
- "traefik.enable=true"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-idp.entrypoints=https"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-idp.rule=Host(`idp-${DRUPAL_HOSTNAME}`)"
- "traefik.http.routers.${COMPOSE_PROJECT_NAME}-idp.tls=true"
- "traefik.http.services.${COMPOSE_PROJECT_NAME}-idp.loadbalancer.server.port=8080"
- "traefik.docker.network=stonehenge-network"
networks:
- internal
- stonehenge-network

Loading
Loading