Skip to content

Commit 9f75fe7

Browse files
emirhandurmusemirhandurmus
committed
merge prep
1 parent d53592a commit 9f75fe7

212 files changed

Lines changed: 358 additions & 343 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yaml‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ jobs:
4747
- name: Replace values
4848
shell: bash
4949
env:
50-
PAT: ${{ secrets.PAT }}
50+
PAT: ${{ secrets.GITHUB_TOKEN }}
5151
run: |
52-
sed -i.back "s|PAT|${PAT}|g" .npmrc
53-
- run: npm config set @datasance:registry https://npm.pkg.github.com/
52+
sed -i.back "s|PAT|${GITHUB_TOKEN}|g" .npmrc
53+
- run: npm config set @eclipse-iofog:registry https://npm.pkg.github.com/
5454
- run: npm install --build-from-source --force
5555
- run: npm run standard
5656
- run: |
@@ -83,10 +83,10 @@ jobs:
8383
- name: Replace values
8484
shell: bash
8585
env:
86-
PAT: ${{ secrets.PAT }}
86+
PAT: ${{ secrets.GITHUB_TOKEN }}
8787
run: |
8888
sed -i.back "s|PAT|${PAT}|g" .npmrc
89-
- run: npm config set @datasance:registry https://npm.pkg.github.com/
89+
- run: npm config set @eclipse-iofog:registry https://npm.pkg.github.com/
9090
- run: npm install --build-from-source --force
9191

9292
- name: npm version
@@ -138,7 +138,7 @@ jobs:
138138
with:
139139
registry: "ghcr.io"
140140
username: ${{ github.actor }}
141-
password: ${{ secrets.PAT }}
141+
password: ${{ secrets.GITHUB_TOKEN }}
142142

143143
- name: Build and Push to ghcr
144144
uses: docker/build-push-action@v3
@@ -149,8 +149,7 @@ jobs:
149149
platforms: linux/amd64, linux/arm64
150150
push: true
151151
outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Controller
152-
build-args: GITHUB_TOKEN=${{ secrets.PAT }}
153152
tags: |
154-
ghcr.io/datasance/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.VERSION }}
155-
ghcr.io/datasance/${{ env.IMAGE_NAME }}:latest
156-
ghcr.io/datasance/${{ env.IMAGE_NAME }}:main
153+
ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:${{ steps.tags.outputs.VERSION }}
154+
ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:latest
155+
ghcr.io/eclipse-iofog/${{ env.IMAGE_NAME }}:main

‎.npmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
//npm.pkg.github.com/:_authToken=PAT
2-
@Datasance:registry=https://npm.pkg.github.com/
2+
@Eclipse-iofog:registry=https://npm.pkg.github.com/

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ ENV NPM_CONFIG_PREFIX=/home/runner/.npm-global
4444
ENV NPM_CONFIG_CACHE=/home/runner/.npm
4545
ENV PATH=$PATH:/home/runner/.npm-global/bin
4646

47-
COPY --from=builder /tmp/datasance-iofogcontroller-*.tgz /home/runner/iofog-controller.tgz
47+
COPY --from=builder /tmp/eclipse-iofog-iofogcontroller-*.tgz /home/runner/iofog-controller.tgz
4848

4949
ENV PID_BASE=/home/runner
5050

5151
RUN npm i -g /home/runner/iofog-controller.tgz && \
5252
rm -rf /home/runner/iofog-controller.tgz && \
5353
iofog-controller config dev-mode --on
5454

55-
RUN rm -rf /home/runner/.npm-global/lib/node_modules/@datasance/iofogcontroller/src/data/sqlite_files/*
55+
RUN rm -rf /home/runner/.npm-global/lib/node_modules/@eclipse-iofog/iofogcontroller/src/data/sqlite_files/*
5656

5757
COPY LICENSE /licenses/LICENSE
5858
LABEL org.opencontainers.image.description=controller
59-
LABEL org.opencontainers.image.source=https://github.com/datasance/controller
59+
LABEL org.opencontainers.image.source=https://github.com/eclipse-iofog/Controller
6060
LABEL org.opencontainers.image.licenses=EPL2.0
61-
CMD [ "node", "/home/runner/.npm-global/lib/node_modules/@datasance/iofogcontroller/src/server.js" ]
61+
CMD [ "node", "/home/runner/.npm-global/lib/node_modules/@eclipse-iofog/iofogcontroller/src/server.js" ]

‎Dockerfile.dev‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ COPY . .
1414
# Set GitHub npm registry with authentication token
1515
RUN sed -i.back "s|PAT|${GITHUB_TOKEN}|g" .npmrc
1616

17-
RUN npm config set @datasance:registry https://npm.pkg.github.com/
17+
RUN npm config set @eclipse-iofog:registry https://npm.pkg.github.com/
1818

1919
RUN npm i --build-from-source --force
2020

@@ -36,13 +36,13 @@ RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
3636
RUN python3 -m ensurepip
3737
RUN pip3 install --no-cache --upgrade pip setuptools
3838

39-
COPY --from=builder /tmp/datasance-iofogcontroller-*.tgz /tmp/iofog-controller.tgz
39+
COPY --from=builder /tmp/eclipse-iofog-iofogcontroller-*.tgz /tmp/iofog-controller.tgz
4040

4141
RUN npm i -g /tmp/iofog-controller.tgz && \
4242
rm -rf /tmp/iofog-controller.tgz && \
4343
iofog-controller config dev-mode --on
4444

4545
LABEL org.opencontainers.image.description=controller
46-
LABEL org.opencontainers.image.source=https://github.com/datasance/controller
46+
LABEL org.opencontainers.image.source=https://github.com/eclipse-iofog/Controller
4747
LABEL org.opencontainers.image.licenses=EPL2.0
48-
CMD [ "node", "/usr/local/lib/node_modules/@datasance/iofogcontroller/src/server.js" ]
48+
CMD [ "node", "/usr/local/lib/node_modules/@eclipse-iofog/iofogcontroller/src/server.js" ]

‎Dockerfile.rel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
3131
RUN python3 -m ensurepip
3232
RUN pip3 install --no-cache --upgrade pip setuptools
3333
LABEL org.opencontainers.image.description controller
34-
LABEL org.opencontainers.image.source=https://github.com/datasance/controller
34+
LABEL org.opencontainers.image.source=https://github.com/eclipse-iofog/Controller
3535
LABEL org.opencontainers.image.licenses=EPL2.0
36-
COPY --from=builder /tmp/datasance-iofogcontroller-*.tgz /tmp/iofog-controller.tgz
36+
COPY --from=builder /tmp/eclipse-iofog-iofogcontroller-*.tgz /tmp/iofog-controller.tgz
3737

3838
RUN npm i -g /tmp/iofog-controller.tgz && \
3939
rm -rf /tmp/iofog-controller.tgz && \
4040
iofog-controller config dev-mode --on
4141

4242

43-
CMD [ "node", "/usr/local/lib/node_modules/@datasance/iofogcontroller/src/server.js" ]
43+
CMD [ "node", "/usr/local/lib/node_modules/@eclipse-iofog/iofogcontroller/src/server.js" ]

‎README.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
### Status
44

5-
![](https://img.shields.io/github/release/datasance/controller.svg?style=flat)
5+
![](https://img.shields.io/github/release/eclipse-iofog/controller.svg?style=flat)
66

7-
![](https://img.shields.io/github/repo-size/datasance/controller.svg?style=flat)
8-
![](https://img.shields.io/github/last-commit/datasance/controller.svg?style=flat)
9-
![](https://img.shields.io/github/contributors/datasance/controller.svg?style=flat)
10-
![](https://img.shields.io/github/issues/datasance/controller.svg?style=flat)
7+
![](https://img.shields.io/github/repo-size/eclipse-iofog/controller.svg?style=flat)
8+
![](https://img.shields.io/github/last-commit/eclipse-iofog/controller.svg?style=flat)
9+
![](https://img.shields.io/github/contributors/eclipse-iofog/controller.svg?style=flat)
10+
![](https://img.shields.io/github/issues/eclipse-iofog/controller.svg?style=flat)
1111

1212
![Supports amd64 Architecture][amd64-shield]
1313
![Supports aarch64 Architecture][arm64-shield]
@@ -19,13 +19,13 @@
1919

2020
## Install
2121

22-
The entire Datasance PoT platform is best deployed through the unified CLI: `potctl`.
22+
The entire Eclipse ioFog platform is best deployed through the unified CLI: `iofogctl`.
2323

24-
Go to [Datasance Docs](https://docs.datasance.com) to learn how to deploy the ioFog Control Plane and Agents.
24+
Go to [Eclipse ioFog Docs](https://docs.eclipse-iofog.com) to learn how to deploy the ioFog Control Plane and Agents.
2525

2626
## Usage
2727
```
2828
iofog-controller <command> <action> <options>
2929
```
3030

31-
For full installation and usage, visit [Datasance Docs](https://docs.datasance.com).
31+
For full installation and usage, visit [Eclipse ioFog Docs](https://docs.eclipse-iofog.com).

‎docs/swagger.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"openapi" : "3.0.0",
33
"info" : {
44
"version" : "1.0.0",
5-
"title" : "Datasance PoT Controller"
5+
"title" : "Eclipse ioFog Controller"
66
},
77
"tags" : [ {
88
"name" : "Controller",

‎docs/swagger.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
openapi : "3.0.0"
22
info:
33
version: 3.7.0
4-
title: Datasance PoT Controller
4+
title: Eclipse ioFog Controller
55
paths:
66
/status:
77
get:

‎logrotate.conf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
postrotate
1111
if [ -f /home/runner/iofog-controller.pid ]; then
1212
kill -HUP `cat /home/runner/iofog-controller.pid`;
13-
elif [ -f /opt/iofog/controller/lib/node_modules/@datasance/iofogcontroller/src/iofog-controller.pid ]; then
14-
kill -HUP `cat /opt/iofog/controller/lib/node_modules/@datasance/iofogcontroller/src/iofog-controller.pid`;
13+
elif [ -f /opt/iofog/controller/lib/node_modules/@eclipse-iofog/iofogcontroller/src/iofog-controller.pid ]; then
14+
kill -HUP `cat /opt/iofog/controller/lib/node_modules/@eclipse-iofog/iofogcontroller/src/iofog-controller.pid`;
1515
fi
1616
endscript
1717
}

‎package-lock.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)