Skip to content

Commit

Permalink
Rename resoto -> fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lloesche committed Feb 26, 2024
1 parent 178f2e8 commit f47905b
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ body:
id: version
attributes:
label: Version
description: What version of Resoto are you running?
description: What version of Fix Inventory are you running?
validations:
required: true
- type: input
Expand Down Expand Up @@ -52,4 +52,4 @@ body:
- type: markdown
attributes:
value: |
By submitting this bug report, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
By submitting this bug report, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ contact_links:
url: https://discord.gg/someengineering
about: Chat with other users and the development team
- name: 📄 Documentation
url: https://resoto.com/docs
url: https://inventory.fix.security/docs
about: Read and search documentation
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ body:
- type: markdown
attributes:
value: |
By submitting this feature request, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
By submitting this feature request, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

- [ ] Add test coverage for new or updated functionality
- [ ] Lint and test with `tox`
- [ ] Document new or updated functionality (someengineering/resoto.com#XXXX)
- [ ] Document new or updated functionality (someengineering/inventory.fix.security#XXXX)

# Issues Fixed

Expand All @@ -21,4 +21,4 @@

# Code of Conduct

By submitting this pull request, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
By submitting this pull request, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
12 changes: 6 additions & 6 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
echo ${{ steps.platform.outputs.targets }}
echo ${{ steps.platform.outputs.latest }}
- name: Docker resotopython meta
- name: Docker fixpython meta
id: pythonmeta
uses: docker/metadata-action@v4
with:
images: |
someengineering/resotopython
ghcr.io/someengineering/resotopython
someengineering/fixpython
ghcr.io/someengineering/fixpython
flavor: |
latest=${{ steps.platform.outputs.latest }}
tags: |
Expand All @@ -62,8 +62,8 @@ jobs:
type=sha,prefix=
type=edge
labels: |
org.opencontainers.image.title=resotopython
org.opencontainers.image.description=Resoto Python base image
org.opencontainers.image.title=fixpython
org.opencontainers.image.description=Fix Inventory Python base image
org.opencontainers.image.vendor=Some Engineering Inc.
- name: Set up QEMU
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push resotopython Docker image
- name: Build and push fixpython Docker image
uses: docker/build-push-action@v3
with:
context: .
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ docs/_build/
.DS_Store
.coverage
.dccache
resotoshell/backup_*
resotocore/tools/Assets
fixshell/backup_*
fixcore/tools/Assets
out/
*.iml
**/.hypothesis/
.sandbox/*
.sandbox/*
11 changes: 4 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# This is the resoto python container. It includes CPython and is used
# as the common base for all the other containers. The main size contributor
# is the resoto-venv-python3 virtual environment which
# is required for all resoto packages. That's why size wise it made sense to
# use the same base package for all containers.
# This is the Fix Inventory Python container. It includes CPython and is used
# as the common base for all the other containers.
FROM ubuntu:20.04 as build-env
ENV DEBIAN_FRONTEND=noninteractive
ARG TARGETPLATFORM
Expand Down Expand Up @@ -56,10 +53,10 @@ RUN /usr/local/python/bin/python3 -m ensurepip

# Create CPython venv
WORKDIR /usr/local
RUN /usr/local/python/bin/python3 -m venv resoto-venv-python3
RUN /usr/local/python/bin/python3 -m venv fix-venv-python3

# Download and install Python test tools
RUN . /usr/local/resoto-venv-python3/bin/activate && python -m pip install -U pip wheel tox flake8
RUN . /usr/local/fix-venv-python3/bin/activate && python -m pip install -U pip wheel tox flake8


# Setup main image
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# resotopython-docker
# fixpython-docker

0 comments on commit f47905b

Please sign in to comment.