Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.0.3 #31

Merged
merged 60 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
738d98c
add alpha workflow
almenscorner Sep 28, 2023
49d3230
bump to 2.0.3 alpha 1
almenscorner Sep 28, 2023
72d93fc
add new column for documentation
almenscorner Sep 28, 2023
fa7292b
update for new documentation and improved tenants view
almenscorner Sep 28, 2023
fdeaf1b
add documentation and refactor
almenscorner Sep 28, 2023
af31039
update for new documentation option
almenscorner Sep 28, 2023
09bc7db
refcator to use ajax request
almenscorner Sep 28, 2023
31b0d81
add view for tenant edit ajax request
almenscorner Sep 28, 2023
05dae5d
Create c0f5d21d08c7_.py
almenscorner Sep 28, 2023
69f183f
add mistune for md to html conversion
almenscorner Sep 28, 2023
96ca648
change message to clarify step
almenscorner Sep 28, 2023
69505c3
add doc folder
almenscorner Sep 28, 2023
77fb2f4
update material dashboard
almenscorner Sep 29, 2023
7624492
make placeholder look a bit nicer
almenscorner Sep 29, 2023
e6c0990
check no session storage
almenscorner Sep 29, 2023
012f70b
add broadcast to socketio
almenscorner Sep 29, 2023
fbd8e4b
add intunecd run cancel
almenscorner Sep 29, 2023
9cfebd1
update last task id
almenscorner Sep 29, 2023
fe7cbeb
add cancel button
almenscorner Sep 29, 2023
667db6c
add cancelled status
almenscorner Sep 29, 2023
a44222c
bump to 2.0.3a2
almenscorner Sep 29, 2023
38e257c
fix empty push due to untracked files
almenscorner Sep 29, 2023
3a6b6b0
update material dashboard
almenscorner Oct 4, 2023
e6cc860
refactor home route and add purge tasks
almenscorner Oct 4, 2023
28fbc21
refactor and split out emit and add status check
almenscorner Oct 4, 2023
0254d4c
Create socket_tasks.py
almenscorner Oct 4, 2023
34a45a3
include scripts.js
almenscorner Oct 4, 2023
29b07ce
refactor for ajax requests
almenscorner Oct 4, 2023
8ca356d
add purge tasks
almenscorner Oct 4, 2023
a30abfa
Create home_feeds.html
almenscorner Oct 4, 2023
018ddf4
Create tenant_data.py
almenscorner Oct 4, 2023
af6afb7
do not ignore celery task results
almenscorner Oct 4, 2023
2590680
move jquery
almenscorner Oct 4, 2023
9163957
add cancel
almenscorner Oct 4, 2023
c568255
add periodic check
almenscorner Oct 4, 2023
c4bf976
Bump version 2.0.3a2 -> 2.0.3a3
almenscorner Oct 4, 2023
e143b39
change to float
almenscorner Oct 5, 2023
5790b8d
additional tenant data
almenscorner Oct 5, 2023
10babce
fix average count
almenscorner Oct 5, 2023
ba883cf
return dates instead of full object and diff_len
almenscorner Oct 5, 2023
4a04422
Create c7c8f17c211a_.py
almenscorner Oct 5, 2023
7f01da3
fix change average
almenscorner Oct 5, 2023
6e7afe7
Bump version 2.0.3a3 -> 2.0.3a4
almenscorner Oct 5, 2023
3161d31
Bump to beta 1 and create periodic status check
almenscorner Oct 6, 2023
6eef561
refactor accordion search
almenscorner Oct 6, 2023
ecd9ded
refactor accordion search
almenscorner Oct 6, 2023
1cf26e3
refactor home scritps and fix table search
almenscorner Oct 6, 2023
afdc295
refactor home scritps and fix table search
almenscorner Oct 6, 2023
baaa25e
add id to tenants in assignment and changes routes
almenscorner Oct 6, 2023
dd8fc1d
remove periodic status check
almenscorner Oct 6, 2023
3f9cf82
refactor route scripts
almenscorner Oct 6, 2023
365d90d
only show documentation for baseline
almenscorner Oct 6, 2023
24d3cb6
Merge pull request #30 from almenscorner/alpha
almenscorner Oct 6, 2023
e5cf873
don't update db blindly
almenscorner Oct 6, 2023
0110aa8
fix incorrect task
almenscorner Oct 7, 2023
764fec8
update db upgrade script
almenscorner Oct 7, 2023
bd4a68a
documentation vol and remove --pool
almenscorner Oct 9, 2023
978f090
documentation vol and remove --pool
almenscorner Oct 9, 2023
cc80551
bump to version 2.0.3
almenscorner Oct 9, 2023
91f4a0e
bump IntuneCD to version 2.0.2
almenscorner Oct 9, 2023
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
352 changes: 352 additions & 0 deletions .github/workflows/docker-publish-alpha.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,352 @@
name: Docker-alpha

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

on:
workflow_dispatch:
push:
branches:
- 'alpha'

env:
# Use docker.io for Docker Hub if empty
REGISTRY: ghcr.io
# github.repository as <account>/<repo>
IMAGE_NAME_APP: ${{ github.repository }}
IMAGE_NAME_NGINX: ${{ github.repository }}/nginx
IMAGE_NAME_WORKER: ${{ github.repository }}/worker
IMAGE_NAME_BEAT: ${{ github.repository }}/beat
IMAGE_NAME_REDIS: ${{ github.repository }}/redis


jobs:
build-app:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/[email protected]


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_APP }}
tags: |
type=raw,value=alpha
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
with:
context: .
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# Sign the resulting Docker image digest except on PRs.
# This will only write to the public Rekor transparency log when the Docker
# repository is public to avoid leaking data. If you would like to publish
# transparency data even for private images, pass --force to cosign below.
# https://github.com/sigstore/cosign
- name: Sign the published Docker image
if: ${{ github.event_name != 'pull_request' }}
env:
COSIGN_EXPERIMENTAL: true
# This step uses the identity token to provision an ephemeral certificate
# against the sigstore community Fulcio instance.
run: cosign sign --yes ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

build-nginx:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@master

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/[email protected]


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v1

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/[email protected]
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_NGINX }}
tags: |
type=raw,value=alpha
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v2
with:
context: .
file: ./nginx/Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# https://github.com/sigstore/cosign
- name: Sign the published Docker image
if: ${{ github.event_name != 'pull_request' }}
env:
COSIGN_EXPERIMENTAL: true
# This step uses the identity token to provision an ephemeral certificate
# against the sigstore community Fulcio instance.
run: cosign sign --yes ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

build-worker:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@master

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/[email protected]


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v1

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/[email protected]
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_WORKER }}
tags: |
type=raw,value=alpha
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile-worker
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# https://github.com/sigstore/cosign
- name: Sign the published Docker image
if: ${{ github.event_name != 'pull_request' }}
env:
COSIGN_EXPERIMENTAL: true
# This step uses the identity token to provision an ephemeral certificate
# against the sigstore community Fulcio instance.
run: cosign sign --yes ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

build-beat:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@master

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/[email protected]


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v1

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/[email protected]
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_BEAT }}
tags: |
type=raw,value=alpha
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile-beat
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# https://github.com/sigstore/cosign
- name: Sign the published Docker image
if: ${{ github.event_name != 'pull_request' }}
env:
COSIGN_EXPERIMENTAL: true
# This step uses the identity token to provision an ephemeral certificate
# against the sigstore community Fulcio instance.
run: cosign sign --yes ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}

build-redis:

runs-on: ubuntu-latest
permissions:
contents: read
packages: write
# This is used to complete the identity challenge
# with sigstore/fulcio when running outside of PRs.
id-token: write

steps:
- name: Checkout repository
uses: actions/checkout@master

# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
if: github.event_name != 'pull_request'
uses: sigstore/[email protected]


# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
uses: docker/setup-buildx-action@v1

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Log into registry ${{ env.REGISTRY }}
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Extract metadata (tags, labels) for Docker
# https://github.com/docker/metadata-action
- name: Extract Docker metadata
id: meta
uses: docker/[email protected]
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_REDIS }}
tags: |
type=raw,value=alpha
# Build and push Docker image with Buildx (don't push on PR)
# https://github.com/docker/build-push-action
- name: Build and push Docker image
id: build-and-push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile-redis
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

# https://github.com/sigstore/cosign
- name: Sign the published Docker image
if: ${{ github.event_name != 'pull_request' }}
env:
COSIGN_EXPERIMENTAL: true
# This step uses the identity token to provision an ephemeral certificate
# against the sigstore community Fulcio instance.
run: cosign sign --yes ${{ steps.meta.outputs.tags }}@${{ steps.build-and-push.outputs.digest }}
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,7 @@ ADD . /intunecd

# create db folder
RUN mkdir /intunecd/db
# create doc folder
RUN mkdir /intunecd/documentation

ENTRYPOINT ["/bin/bash", "-c", "./server-entrypoint.sh"]
Loading