Skip to content

Commit 38635ab

Browse files
committed
Merge remote-tracking branch 'upstream/master' into multiarch
2 parents d119f19 + c5f4433 commit 38635ab

17 files changed

+980
-44
lines changed

.github/workflows/docker-image.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
name: Docker Release
2+
name: Push Release to Docker Hub
33

44
on:
55
release:
66
types: [published]
77

88
env:
99
DOCKER_USER: samueltallet
10-
DOCKER_REPO: mongodb-php-gui
10+
DOCKER_REPOSITORY: mongodb-php-gui
1111

1212
jobs:
1313

@@ -18,33 +18,33 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v3
2020

21-
- name: qemu setup
21+
- name: Setup QEMU
2222
uses: docker/setup-qemu-action@v2
2323

24-
- name: docker buildx
24+
- name: Setup Docker Buildx
2525
uses: docker/setup-buildx-action@v2
2626
with:
2727
config-inline: |
2828
[worker.oci]
2929
max-parallelism = 2
3030
31-
- name: docker meta
31+
- name: Generate Image Tags
3232
id: meta
3333
uses: docker/metadata-action@v4
3434
with:
35-
images: ${{ env.DOCKER_USER }}/${{ env.DOCKER_REPO }}
35+
images: ${{ env.DOCKER_USER }}/${{ env.DOCKER_REPOSITORY }}
3636
tags: |
3737
type=semver,pattern={{version}}
3838
type=semver,pattern={{major}}.{{minor}}
3939
type=semver,pattern={{major}}
4040
41-
- name: docker login
41+
- name: Login to Docker Hub
4242
uses: docker/login-action@v2
4343
with:
4444
username: ${{ env.DOCKER_USER }}
4545
password: ${{ secrets.DOCKER_PASSWORD }}
4646

47-
- name: Build and Push
47+
- name: Build and Push to Docker Hub
4848
uses: docker/build-push-action@v3
4949
with:
5050
context: .

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
vendor/
22
node_modules/
3-
package-lock.json
3+
package-lock.json
4+
*.wip

docs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ Export documents to JSON. Import documents from JSON. Manage indexes. Manage use
99

1010
![MongoDB PHP GUI - Visualize Database](https://raw.githubusercontent.com/SamuelTallet/MongoDB-PHP-GUI/master/docs/screenshots/visualize-database.png)
1111

12-
![MongoDB PHP GUI - Query Database](https://raw.githubusercontent.com/SamuelTallet/MongoDB-PHP-GUI/master/docs/screenshots/query-database.png)
12+
![MongoDB PHP GUI - Query Documents](https://raw.githubusercontent.com/SamuelTallet/MongoDB-PHP-GUI/master/docs/screenshots/query-documents.png)
1313

1414
## Installation
1515

1616
### Docker (PHP built-in server)
1717
1. In a case of an upgrade, run `docker pull samueltallet/mongodb-php-gui`<br>
1818
2. Always run `docker run --add-host localhost:172.17.0.1 --publish 5000:5000 --rm samueltallet/mongodb-php-gui`<br>
19-
3. Open your browser at this address: http://127.0.0.1:5000/ to access GUI.<br>
19+
3. Open your browser at this address: http://127.0.0.1:5000/ to access GUI.
2020

2121
### Apache HTTP server
2222
1. Clone current repository in a folder served by Apache.
23-
2. Be sure to have PHP >= 7.3 with [MongoDB ext.](https://www.php.net/manual/en/mongodb.installation.php) enabled.
23+
2. Be sure to have PHP >= 7.3 with [MongoDB extension](https://www.php.net/manual/en/mongodb.installation.php) enabled.
2424
3. Check that `rewrite_module` module is enabled in your Apache configuration.
2525
4. Be sure to have `AllowOverride All` in your Apache (virtual host) configuration.
2626
5. Run `composer install` at project's root directory to install all PHP dependencies.
93 KB
Loading

index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Capsule\Factory\ServerRequestFactory;
77
use Limber\Exceptions\NotFoundHttpException;
88

9-
const VERSION = '1.3.0';
9+
const VERSION = '1.3.1';
1010

1111
/**
1212
* Absolute path, without trailing slash.

routes.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
$router->get(Routes::getPrefix() . '/', function() {
1212

1313
AuthController::ensureUserIsLogged();
14-
Routes::redirectTo('/queryDatabase');
14+
Routes::redirectTo('/queryDocuments');
1515

1616
});
1717

@@ -71,8 +71,8 @@
7171
);
7272

7373
$router->get(
74-
Routes::getPrefix() . '/queryDatabase',
75-
DatabasesController::class . '@query'
74+
Routes::getPrefix() . '/queryDocuments',
75+
DocumentsController::class . '@query'
7676
);
7777

7878
$router->post(

0 commit comments

Comments
 (0)