From aaacac2f76b597ba4d16cae3c92350e179884fc6 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 7 Apr 2021 10:35:32 +0200
Subject: [PATCH] Switch from ssh to https for all git repos
While we directed the docker image to translate the URLs to https anyway
this can be confusing since git behaves differently in docker vs outside.
Also in the meantime we have made all repos public, so there is no auth needed
for the repos and the extra work required using https no longer applies.
---
composer.json | 4 ++--
composer.lock | 18 +++++++++---------
docker-dev/php-fpm/Dockerfile | 2 --
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/composer.json b/composer.json
index 395d593..a2e0f91 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,11 @@
"repositories": [
{
"type": "vcs",
- "url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-core-bundle.git"
+ "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-core-bundle.git"
},
{
"type": "vcs",
- "url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-starter-bundle.git"
+ "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-starter-bundle.git"
}
],
"config": {
diff --git a/composer.lock b/composer.lock
index 2383208..18aaf20 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "4c99bf31e339f720da01c8c4250fde21",
+ "content-hash": "517b40d0ec0b008cc105a4eec16322ac",
"packages": [
{
"name": "api-platform/core",
@@ -223,7 +223,7 @@
"version": "dev-main",
"source": {
"type": "git",
- "url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-core-bundle.git",
+ "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-core-bundle.git",
"reference": "ef75ab8e92487c401958420d30b11dc7ffd1971c"
},
"require": {
@@ -308,7 +308,7 @@
"version": "dev-main",
"source": {
"type": "git",
- "url": "git@gitlab.tugraz.at:dbp/middleware/dbp-api/api-starter-bundle.git",
+ "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-starter-bundle.git",
"reference": "6114e6e3808eea8fb72d9ead209d334da3c7ca34"
},
"require": {
@@ -6819,16 +6819,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.18.4",
+ "version": "v2.18.5",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "06f764e3cb6d60822d8f5135205f9d32b5508a31"
+ "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/06f764e3cb6d60822d8f5135205f9d32b5508a31",
- "reference": "06f764e3cb6d60822d8f5135205f9d32b5508a31",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/e0f6d05c8b157f50029ca6c65c19ed2694f475bf",
+ "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf",
"shasum": ""
},
"require": {
@@ -6911,7 +6911,7 @@
"description": "A tool to automatically fix PHP code style",
"support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
- "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.4"
+ "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.5"
},
"funding": [
{
@@ -6919,7 +6919,7 @@
"type": "github"
}
],
- "time": "2021-03-20T14:52:33+00:00"
+ "time": "2021-04-06T18:37:33+00:00"
},
{
"name": "netresearch/jsonmapper",
diff --git a/docker-dev/php-fpm/Dockerfile b/docker-dev/php-fpm/Dockerfile
index 40f9916..5651b9f 100644
--- a/docker-dev/php-fpm/Dockerfile
+++ b/docker-dev/php-fpm/Dockerfile
@@ -50,8 +50,6 @@ ENV PATH "/home/user/.local/bin:${PATH}"
USER user
-RUN git config --global url."https://gitlab.tugraz.at/".insteadOf "git@gitlab.tugraz.at:"
-
CMD ["/usr/sbin/php-fpm7.3", "-O" ]
EXPOSE 9000
WORKDIR "/application"
\ No newline at end of file
--
GitLab