Skip to content

Commit

Permalink
Merge pull request #768 from Azure/table
Browse files Browse the repository at this point in the history
Merge table branch back to master branch
  • Loading branch information
XiaoningLiu authored Apr 30, 2021
2 parents b9b3a2a + 2296008 commit 8a5f99e
Show file tree
Hide file tree
Showing 181 changed files with 25,829 additions and 18,244 deletions.
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.vscode/**
.github/**
.github
node_modules/**
swagger/**
__blobstorage__/**
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ debug.log
*.tgz
__*
*.env
temp
temp
**/.DS_Store.DS_Store
*.pem
5 changes: 5 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
node_modules/
src/
typings/
coverage
.prettierrc.json
README.mcr.md
azurite-testdrive/
.nyc_output
debug.log
Expand All @@ -8,6 +12,7 @@ azure-pipelines.yml
ISSUE_TEMPLATE.md
PULL_REQUEST_TEMPLATE.md
.vscode/
.github/
tslint.json
tsconfig.json
*.vsix
Expand Down
13 changes: 13 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"env": {
"AZURITE_ACCOUNTS": ""
},
"skipFiles": ["node_modules/*/**", "<node_internals>/*/**"],
"outputCapture": "std"
},
{
Expand Down Expand Up @@ -108,6 +109,18 @@
},
"outputCapture": "std"
},
{
"type": "node",
"request": "launch",
"name": "Azurite Table Service - Loki",
"cwd": "${workspaceFolder}",
"runtimeArgs": ["-r", "ts-node/register"],
"args": ["${workspaceFolder}/src/table/main.ts", "-d", "debug.log"],
"env": {
"AZURITE_ACCOUNTS": ""
},
"outputCapture": "std"
},
{
"type": "node",
"request": "launch",
Expand Down
5 changes: 4 additions & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ __blobstorage__
__queueTestsPersistence__
__*
*.env
temp
temp
.github
.prettierrc.json
README.mcr.md
17 changes: 17 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,19 @@
## Upcoming Release

## 2021.4 Version 3.12.0

Table:

- Preview of Table Service in npm package and docker image. (Visual Studio Code extension doesn't support Table Service in this release)
- Allow empty RowKey in an entity.
- Fix etag format to be aligned with Azure server.
- Fix delet none exist table error code and error message, to be aligned with Azure server.
- Convert entity properties with type "Edm.DateTime" to UTC time, to be aligned with Azure server.
- Support Batch API.
- Allow complex RowKey and PartitionKey in batch API.
- Add support for replaying requests logged in debug logging.

## 2021.2 Version 3.11.0

- Bump up Azure Storage service API version to 2020-06-12.
Expand All @@ -25,6 +38,10 @@ Blob:
- Fix an issue that snapshot time is omitted in get block list.
- Fix an issue that no error throw when clear pages, get page ranges and upload pages with invalid page range.

## 2020.11 Version 3.11.0-table-alpha.1

- First Alpha version of Azurite V3 Table.

## 2020.10 Version 3.9.0

- Bump up Azure Storage service API version to 2020-02-10.
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ WORKDIR /opt/azurite

# Install dependencies first
COPY *.json LICENSE NOTICE.txt ./
RUN npm config set unsafe-perm=true && \
npm ci

# Copy the source code and build the app
COPY src ./src
COPY tests ./tests
RUN npm config set unsafe-perm=true && \
npm ci
RUN npm run build && \
npm install -g --loglevel verbose

Expand All @@ -31,16 +31,16 @@ VOLUME [ "/data" ]

COPY package*.json LICENSE NOTICE.txt ./

RUN npm config set unsafe-perm=true && \
npm ci

COPY --from=builder /opt/azurite/dist/ dist/

RUN npm install -g --loglevel verbose
RUN npm config set unsafe-perm=true && \
npm install -g --loglevel verbose

# Blob Storage Port
EXPOSE 10000
# Queue Storage Port
EXPOSE 10001
# Table Storage Port
EXPOSE 10002

CMD ["azurite", "-l", "/data", "--blobHost", "0.0.0.0","--queueHost", "0.0.0.0"]
CMD ["azurite", "-l", "/data", "--blobHost", "0.0.0.0","--queueHost", "0.0.0.0", "--tableHost", "0.0.0.0"]
Loading

0 comments on commit 8a5f99e

Please sign in to comment.