Skip to content

Commit

Permalink
Merge branch 'main' into minor-update
Browse files Browse the repository at this point in the history
  • Loading branch information
bengarrett authored May 30, 2024
2 parents 12f45d8 + 11a71ac commit 1f59560
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 95 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
- Browser [e.g. Chrome, Safari]
- Version [e.g. 122]

**Smartphone (please complete the following information):**
Unfortunately not supported.
Expand Down
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ updates:
directory: "/" # Location of package manifests
schedule:
interval: "monthly"
target-branch: "main"
open-pull-requests-limit: 10
groups:
updates:
update-types:
- "minor"
- "patch"
- package-ecosystem: github-actions
directory: "/"
schedule:
Expand Down
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Is this a documentation update (if yes, please continue onto _Changes proposed_)

Platforms tested or developed on:

- [ ] Windows 10
- [ ] Windows
- [ ] Linux (please include distro and version) \_
- [ ] macOS

Expand Down
31 changes: 31 additions & 0 deletions .github/workflows/docker-hub.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: DockerHub

on:
workflow_dispatch:
push:
tags:
- v*

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- # Add support for more platforms with QEMU (optional)
# https://github.com/docker/setup-qemu-action
name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push Docker images
uses: docker/build-push-action@v5.3.0
with:
platforms: linux/amd64,linux/arm64
push: true
tags: bengarrett/dosee:latest
23 changes: 0 additions & 23 deletions .github/workflows/dockerhub.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/shiftleft-analysis.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ tmp/
*.tgz

# VSCode
.vscode/tasks.json
.vscode/tasks.json

.DS_Store
29 changes: 1 addition & 28 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,36 +50,9 @@ npm run serve

Point a web browser to http://localhost:8086

### Docker instructions

There is a [DOSee repository at Docker Hub](https://hub.docker.com/repository/docker/bengarrett/dosee), or you can build locally using these instructions.

```bash
# clone DOSee
git clone git@github.com:bengarrett/DOSee.git
cd DOSee

# run the container (tap Ctrl-C to exit)
docker compose up
```

Point a web browser to http://localhost:8086

```bash
# alternative manual build and run
docker build -t dosee .
docker run --name dosee_app -i -p 8086:80 dosee

# clean up and remove
docker container rm dosee_app
docker image rm dosee
```

## Usage & customisations

[Are in the USAGE document](USAGE.md)

### Editing the source JS or HTML
## Editing the source JS or HTML

If you edit the source files in `src/` you will need to rebuild the application.

Expand Down

0 comments on commit 1f59560

Please sign in to comment.